From eef772a2242cea641b07f0308ea129539a08745c Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 10 Aug 2020 16:01:57 -0700 Subject: [PATCH 01/20] e2e -> integration_test --- .cirrus.yml | 14 ++--- CODEOWNERS | 2 +- .../androidalarmmanager/MainActivityTest.java | 2 +- .../example/pubspec.yaml | 4 +- .../android_alarm_manager_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../MainActivityTest.java | 2 +- packages/android_intent/example/pubspec.yaml | 4 +- .../test_driver/android_intent_e2e.dart | 4 +- .../battery/EmbedderV1ActivityTest.java | 2 +- .../plugins/battery/FlutterActivityTest.java | 2 +- .../batteryexample/EmbedderV1Activity.java | 4 +- packages/battery/example/pubspec.yaml | 4 +- packages/battery/pubspec.yaml | 4 +- packages/battery/test/battery_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../cameraexample/FlutterActivityTest.java | 2 +- .../cameraexample/EmbeddingV1Activity.java | 4 +- packages/camera/example/pubspec.yaml | 4 +- .../example/test_driver/camera_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../connectivity/example/pubspec.yaml | 4 +- .../test_driver/test/connectivity_e2e.dart | 4 +- .../connectivity/connectivity/pubspec.yaml | 4 +- .../connectivity/test/connectivity_e2e.dart | 4 +- .../connectivity_for_web/pubspec.yaml | 4 +- .../connectivity_for_web/test/lib/main.dart | 4 +- .../connectivity_for_web/test/pubspec.yaml | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../connectivity_macos/example/pubspec.yaml | 4 +- .../test_driver/test/connectivity_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- packages/device_info/example/pubspec.yaml | 4 +- .../example/test_driver/device_info_e2e.dart | 4 +- packages/e2e/android/settings.gradle | 1 - .../e2e/example/ios/RunnerTests/RunnerTests.m | 4 -- .../Flutter/GeneratedPluginRegistrant.swift | 12 ---- .../example/test_driver/example_e2e_test.dart | 5 -- packages/e2e/ios/Classes/E2EIosTest.h | 22 ------- packages/e2e/ios/Classes/E2EPlugin.h | 23 ------- packages/e2e/ios/Classes/E2EPlugin.m | 53 ---------------- .../EmbeddingV1ActivityTest.java | 2 +- .../MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- .../MainActivity.java | 4 +- .../example/pubspec.yaml | 4 +- .../flutter_plugin_android_lifecycle_e2e.dart | 4 +- .../googlemaps/EmbeddingV1ActivityTest.java | 2 +- .../plugins/googlemaps/MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- .../google_maps_flutter/example/pubspec.yaml | 4 +- .../example/test_driver/google_maps_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../example/pubspec.yaml | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../google_sign_in/example/pubspec.yaml | 4 +- .../google_sign_in/pubspec.yaml | 4 +- .../test/google_sign_in_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../image_picker/example/pubspec.yaml | 4 +- .../image_picker/image_picker/pubspec.yaml | 4 +- .../test/old_image_picker_e2e.dart | 4 +- .../EmbeddingV1Activity.java | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- packages/in_app_purchase/example/pubspec.yaml | 4 +- packages/in_app_purchase/pubspec.yaml | 4 +- .../test/in_app_purchase_e2e.dart | 4 +- packages/{e2e => integration_test}/.gitignore | 0 packages/{e2e => integration_test}/.metadata | 0 .../{e2e => integration_test}/CHANGELOG.md | 6 +- packages/{e2e => integration_test}/LICENSE | 0 packages/{e2e => integration_test}/README.md | 33 +++++----- .../android/.gitignore | 0 .../android/build.gradle | 2 +- .../android/gradle.properties | 0 .../integration_test/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 2 +- .../integrationTest}/FlutterTestRunner.java | 4 +- .../IntegrationTestPlugin.java} | 12 ++-- .../example/.gitignore | 0 .../example/.metadata | 0 .../example/README.md | 0 .../example/android/app/build.gradle | 2 +- .../e2e_example/EmbedderV1ActivityTest.java | 4 +- .../e2e_example/FlutterActivityTest.java | 4 +- .../FlutterActivityWithPermissionTest.java | 6 +- .../android/app/src/debug/AndroidManifest.xml | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../e2e_example/EmbedderV1Activity.java | 6 +- .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 2 +- .../example/android/build.gradle | 0 .../example/android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../example/android/settings.gradle | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../example/ios/Flutter/Debug.xcconfig | 0 .../example/ios/Flutter/Release.xcconfig | 0 .../ios/Runner.xcodeproj/project.pbxproj | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../example/ios/Runner/AppDelegate.h | 0 .../example/ios/Runner/AppDelegate.m | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../example/ios/Runner/Info.plist | 2 +- .../example/ios/Runner/main.m | 0 .../example/ios/RunnerTests/Info.plist | 0 .../example/ios/RunnerTests/RunnerTests.m | 4 ++ .../example/lib/main.dart | 0 .../example/lib/my_app.dart | 0 .../example/lib/my_web_app.dart | 0 .../macos/Flutter/Flutter-Debug.xcconfig | 0 .../macos/Flutter/Flutter-Release.xcconfig | 0 .../macos/Runner.xcodeproj/project.pbxproj | 6 +- .../xcshareddata/xcschemes/Runner.xcscheme | 8 +-- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../example/macos/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/app_icon_1024.png | Bin .../AppIcon.appiconset/app_icon_128.png | Bin .../AppIcon.appiconset/app_icon_16.png | Bin .../AppIcon.appiconset/app_icon_256.png | Bin .../AppIcon.appiconset/app_icon_32.png | Bin .../AppIcon.appiconset/app_icon_512.png | Bin .../AppIcon.appiconset/app_icon_64.png | Bin .../macos/Runner/Base.lproj/MainMenu.xib | 0 .../macos/Runner/Configs/AppInfo.xcconfig | 4 +- .../macos/Runner/Configs/Debug.xcconfig | 0 .../macos/Runner/Configs/Release.xcconfig | 0 .../macos/Runner/Configs/Warnings.xcconfig | 0 .../macos/Runner/DebugProfile.entitlements | 0 .../example/macos/Runner/Info.plist | 0 .../macos/Runner/MainFlutterWindow.swift | 0 .../example/macos/Runner/Release.entitlements | 0 .../example/pubspec.yaml | 10 +-- .../test_driver/example_integration.dart} | 6 +- .../test_driver/example_integration_io.dart} | 6 +- .../test_driver/example_integration_test.dart | 5 ++ .../test_driver/example_integration_web.dart} | 6 +- .../example/test_driver/failure.dart | 8 +-- .../example/test_driver/failure_test.dart | 2 +- .../example/web/favicon.png | Bin .../example/web/icons/Icon-192.png | Bin .../example/web/icons/Icon-512.png | Bin .../example/web/index.html | 0 .../example/web/manifest.json | 0 .../integration_test_macos}/CHANGELOG.md | 4 ++ .../integration_test_macos}/LICENSE | 0 .../ios/integration_test_macos.podspec} | 8 +-- .../macos/Assets/.gitkeep | 0 .../Classes/IntegrationTestPlugin.swift} | 6 +- .../macos/integration_test_macos.podspec} | 8 +-- .../integration_test_macos}/pubspec.yaml | 8 +-- .../{e2e => integration_test}/ios/.gitignore | 0 .../ios/Assets/.gitkeep | 0 .../ios/Classes/IntegrationTestIosTest.h | 23 +++++++ .../ios/Classes/IntegrationTestIosTest.m} | 32 ++++++---- .../ios/Classes/IntegrationTestPlugin.h | 26 ++++++++ .../ios/Classes/IntegrationTestPlugin.m | 58 ++++++++++++++++++ .../ios/integration_test.podspec} | 8 +-- .../lib/_extension_io.dart | 0 .../lib/_extension_web.dart | 0 .../{e2e => integration_test}/lib/common.dart | 2 +- .../lib/integration_test.dart} | 18 +++--- .../lib/integration_test_driver.dart} | 24 ++++---- .../lib/integration_test_perf.dart} | 7 ++- .../{e2e => integration_test}/pubspec.yaml | 10 +-- .../test/binding_fail_test.dart | 20 +++--- .../test/binding_test.dart | 24 ++++---- .../test/data/README.md | 0 .../test/data/fail_test_script.dart | 8 +-- .../test/data/pass_test_script.dart | 8 +-- .../test/data/pass_then_fail_test_script.dart | 8 +-- .../test/frame_timing_summarizer_test.dart | 2 +- .../test/response_serialization_test.dart | 2 +- .../localauth/EmbeddingV1ActivityTest.java | 2 +- .../plugins/localauth/MainActivityTest.java | 2 +- .../localauthexample/EmbeddingV1Activity.java | 4 +- packages/local_auth/example/pubspec.yaml | 4 +- packages/local_auth/pubspec.yaml | 4 +- packages/local_auth/test/local_auth_e2e.dart | 4 +- .../EmbedderV1ActivityTest.java | 2 +- .../packageinfoexample/MainActivityTest.java | 2 +- packages/package_info/example/pubspec.yaml | 4 +- .../example/test_driver/package_info_e2e.dart | 4 +- packages/package_info/pubspec.yaml | 4 +- .../java/EmbeddingV1ActivityTest.java | 2 +- .../androidTest/java/MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- .../path_provider/example/pubspec.yaml | 4 +- .../test_driver/path_provider_e2e.dart | 4 +- .../path_provider/path_provider/pubspec.yaml | 4 +- .../path_provider/test/path_provider_e2e.dart | 4 +- .../path_provider_linux/example/pubspec.yaml | 4 +- .../test_driver/path_provider_e2e.dart | 4 +- .../java/EmbeddingV1ActivityTest.java | 2 +- .../androidTest/java/MainActivityTest.java | 2 +- .../pathproviderexample/MainActivity.java | 4 +- .../path_provider_macos/example/pubspec.yaml | 4 +- .../test_driver/path_provider_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- packages/quick_actions/example/pubspec.yaml | 4 +- .../test_driver/quick_actions_e2e.dart | 4 +- packages/quick_actions/pubspec.yaml | 4 +- .../sensorsexample/EmbeddingV1Activity.java | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../sensorsexample/FlutterActivityTest.java | 2 +- packages/sensors/example/pubspec.yaml | 4 +- packages/sensors/pubspec.yaml | 4 +- packages/sensors/test/sensors_e2e.dart | 4 +- .../shareexample/EmbeddingV1Activity.java | 4 +- .../shareexample/EmbeddingV1ActivityTest.java | 2 +- .../shareexample/FlutterActivityTest.java | 2 +- packages/share/example/pubspec.yaml | 4 +- packages/share/pubspec.yaml | 4 +- packages/share/test/share_e2e.dart | 4 +- .../EmbeddingV1Activity.java | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../shared_preferences/example/pubspec.yaml | 4 +- .../test_driver/shared_preferences_e2e.dart | 4 +- .../shared_preferences/pubspec.yaml | 4 +- .../example/pubspec.yaml | 4 +- .../test_driver/shared_preferences_e2e.dart | 4 +- .../example/pubspec.yaml | 4 +- .../test_driver/shared_preferences_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../urllauncherexample/MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- .../url_launcher/example/pubspec.yaml | 4 +- .../example/test_driver/url_launcher_e2e.dart | 4 +- .../url_launcher_linux/example/pubspec.yaml | 4 +- .../example/test_driver/url_launcher_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../FlutterActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- .../url_launcher_macos/example/pubspec.yaml | 4 +- .../example/test_driver/url_launcher_e2e.dart | 4 +- .../EmbeddingV1Activity.java | 4 +- .../video_player/example/pubspec.yaml | 4 +- .../example/test_driver/video_player_e2e.dart | 4 +- .../EmbeddingV1ActivityTest.java | 2 +- .../MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 +- packages/webview_flutter/example/pubspec.yaml | 4 +- .../test_driver/webview_flutter_e2e.dart | 4 +- 281 files changed, 537 insertions(+), 522 deletions(-) delete mode 100644 packages/e2e/android/settings.gradle delete mode 100644 packages/e2e/example/ios/RunnerTests/RunnerTests.m delete mode 100644 packages/e2e/example/macos/Flutter/GeneratedPluginRegistrant.swift delete mode 100644 packages/e2e/example/test_driver/example_e2e_test.dart delete mode 100644 packages/e2e/ios/Classes/E2EIosTest.h delete mode 100644 packages/e2e/ios/Classes/E2EPlugin.h delete mode 100644 packages/e2e/ios/Classes/E2EPlugin.m rename packages/{e2e => integration_test}/.gitignore (100%) rename packages/{e2e => integration_test}/.metadata (100%) rename packages/{e2e => integration_test}/CHANGELOG.md (97%) rename packages/{e2e => integration_test}/LICENSE (100%) rename packages/{e2e => integration_test}/README.md (82%) rename packages/{e2e => integration_test}/android/.gitignore (100%) rename packages/{e2e => integration_test}/android/build.gradle (95%) rename packages/{e2e => integration_test}/android/gradle.properties (100%) create mode 100644 packages/integration_test/android/settings.gradle rename packages/{e2e => integration_test}/android/src/main/AndroidManifest.xml (65%) rename packages/{e2e/android/src/main/java/dev/flutter/plugins/e2e => integration_test/android/src/main/java/dev/flutter/plugins/integrationTest}/FlutterTestRunner.java (96%) rename packages/{e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java => integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java} (85%) rename packages/{e2e => integration_test}/example/.gitignore (100%) rename packages/{e2e => integration_test}/example/.metadata (100%) rename packages/{e2e => integration_test}/example/README.md (100%) rename packages/{e2e => integration_test}/example/android/app/build.gradle (96%) rename packages/{e2e => integration_test}/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java (73%) rename packages/{e2e => integration_test}/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java (76%) rename packages/{e2e => integration_test}/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java (77%) rename packages/{e2e => integration_test}/example/android/app/src/debug/AndroidManifest.xml (84%) rename packages/{e2e => integration_test}/example/android/app/src/main/AndroidManifest.xml (94%) rename packages/{e2e => integration_test}/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java (64%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/drawable/launch_background.xml (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename packages/{e2e => integration_test}/example/android/app/src/main/res/values/styles.xml (100%) rename packages/{e2e => integration_test}/example/android/app/src/profile/AndroidManifest.xml (84%) rename packages/{e2e => integration_test}/example/android/build.gradle (100%) rename packages/{e2e => integration_test}/example/android/gradle.properties (100%) rename packages/{e2e => integration_test}/example/android/gradle/wrapper/gradle-wrapper.properties (100%) rename packages/{e2e => integration_test}/example/android/settings.gradle (100%) rename packages/{e2e => integration_test}/example/ios/Flutter/AppFrameworkInfo.plist (100%) rename packages/{e2e => integration_test}/example/ios/Flutter/Debug.xcconfig (100%) rename packages/{e2e => integration_test}/example/ios/Flutter/Release.xcconfig (100%) rename packages/{e2e => integration_test}/example/ios/Runner.xcodeproj/project.pbxproj (100%) rename packages/{e2e => integration_test}/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename packages/{e2e => integration_test}/example/ios/Runner/AppDelegate.h (100%) rename packages/{e2e => integration_test}/example/ios/Runner/AppDelegate.m (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Base.lproj/Main.storyboard (100%) rename packages/{e2e => integration_test}/example/ios/Runner/Info.plist (97%) rename packages/{e2e => integration_test}/example/ios/Runner/main.m (100%) rename packages/{e2e => integration_test}/example/ios/RunnerTests/Info.plist (100%) create mode 100644 packages/integration_test/example/ios/RunnerTests/RunnerTests.m rename packages/{e2e => integration_test}/example/lib/main.dart (100%) rename packages/{e2e => integration_test}/example/lib/my_app.dart (100%) rename packages/{e2e => integration_test}/example/lib/my_web_app.dart (100%) rename packages/{e2e => integration_test}/example/macos/Flutter/Flutter-Debug.xcconfig (100%) rename packages/{e2e => integration_test}/example/macos/Flutter/Flutter-Release.xcconfig (100%) rename packages/{e2e => integration_test}/example/macos/Runner.xcodeproj/project.pbxproj (98%) rename packages/{e2e => integration_test}/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (93%) rename packages/{e2e => integration_test}/example/macos/Runner.xcworkspace/contents.xcworkspacedata (100%) rename packages/{e2e => integration_test}/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{e2e => integration_test}/example/macos/Runner/AppDelegate.swift (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Base.lproj/MainMenu.xib (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Configs/AppInfo.xcconfig (83%) rename packages/{e2e => integration_test}/example/macos/Runner/Configs/Debug.xcconfig (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Configs/Release.xcconfig (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Configs/Warnings.xcconfig (100%) rename packages/{e2e => integration_test}/example/macos/Runner/DebugProfile.entitlements (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Info.plist (100%) rename packages/{e2e => integration_test}/example/macos/Runner/MainFlutterWindow.swift (100%) rename packages/{e2e => integration_test}/example/macos/Runner/Release.entitlements (100%) rename packages/{e2e => integration_test}/example/pubspec.yaml (71%) rename packages/{e2e/example/test_driver/example_e2e.dart => integration_test/example/test_driver/example_integration.dart} (66%) rename packages/{e2e/example/test_driver/example_e2e_io.dart => integration_test/example/test_driver/example_integration_io.dart} (84%) create mode 100644 packages/integration_test/example/test_driver/example_integration_test.dart rename packages/{e2e/example/test_driver/example_e2e_web.dart => integration_test/example/test_driver/example_integration_web.dart} (84%) rename packages/{e2e => integration_test}/example/test_driver/failure.dart (79%) rename packages/{e2e => integration_test}/example/test_driver/failure_test.dart (89%) rename packages/{e2e => integration_test}/example/web/favicon.png (100%) rename packages/{e2e => integration_test}/example/web/icons/Icon-192.png (100%) rename packages/{e2e => integration_test}/example/web/icons/Icon-512.png (100%) rename packages/{e2e => integration_test}/example/web/index.html (100%) rename packages/{e2e => integration_test}/example/web/manifest.json (100%) rename packages/{e2e/e2e_macos => integration_test/integration_test_macos}/CHANGELOG.md (59%) rename packages/{e2e/e2e_macos => integration_test/integration_test_macos}/LICENSE (100%) rename packages/{e2e/e2e_macos/ios/e2e_macos.podspec => integration_test/integration_test_macos/ios/integration_test_macos.podspec} (68%) rename packages/{e2e/e2e_macos => integration_test/integration_test_macos}/macos/Assets/.gitkeep (100%) rename packages/{e2e/e2e_macos/macos/Classes/E2EPlugin.swift => integration_test/integration_test_macos/macos/Classes/IntegrationTestPlugin.swift} (75%) rename packages/{e2e/e2e_macos/macos/e2e_macos.podspec => integration_test/integration_test_macos/macos/integration_test_macos.podspec} (77%) rename packages/{e2e/e2e_macos => integration_test/integration_test_macos}/pubspec.yaml (62%) rename packages/{e2e => integration_test}/ios/.gitignore (100%) rename packages/{e2e => integration_test}/ios/Assets/.gitkeep (100%) create mode 100644 packages/integration_test/ios/Classes/IntegrationTestIosTest.h rename packages/{e2e/ios/Classes/E2EIosTest.m => integration_test/ios/Classes/IntegrationTestIosTest.m} (51%) create mode 100644 packages/integration_test/ios/Classes/IntegrationTestPlugin.h create mode 100644 packages/integration_test/ios/Classes/IntegrationTestPlugin.m rename packages/{e2e/ios/e2e.podspec => integration_test/ios/integration_test.podspec} (81%) rename packages/{e2e => integration_test}/lib/_extension_io.dart (100%) rename packages/{e2e => integration_test}/lib/_extension_web.dart (100%) rename packages/{e2e => integration_test}/lib/common.dart (97%) rename packages/{e2e/lib/e2e.dart => integration_test/lib/integration_test.dart} (90%) rename packages/{e2e/lib/e2e_driver.dart => integration_test/lib/integration_test_driver.dart} (76%) rename packages/{e2e/lib/e2e_perf.dart => integration_test/lib/integration_test_perf.dart} (97%) rename packages/{e2e => integration_test}/pubspec.yaml (71%) rename packages/{e2e => integration_test}/test/binding_fail_test.dart (74%) rename packages/{e2e => integration_test}/test/binding_test.dart (70%) rename packages/{e2e => integration_test}/test/data/README.md (100%) rename packages/{e2e => integration_test}/test/data/fail_test_script.dart (54%) rename packages/{e2e => integration_test}/test/data/pass_test_script.dart (54%) rename packages/{e2e => integration_test}/test/data/pass_then_fail_test_script.dart (53%) rename packages/{e2e => integration_test}/test/frame_timing_summarizer_test.dart (95%) rename packages/{e2e => integration_test}/test/response_serialization_test.dart (97%) diff --git a/.cirrus.yml b/.cirrus.yml index 8120b79842d3..dc2934e5e23c 100644 --- a/.cirrus.yml +++ b/.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,8 +58,8 @@ 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: @@ -105,7 +105,7 @@ task: cpu: 8 memory: 16G env: - E2E_PATH: "./packages/e2e" + INTEGRATION_TEST_PATH: "./packages/integration_test" upgrade_script: - flutter channel stable - flutter upgrade diff --git a/CODEOWNERS b/CODEOWNERS index 51a9407127c9..97f8bf388697 100644 --- a/CODEOWNERS +++ b/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 diff --git a/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java b/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java index 04aef18888a9..63dede1c4520 100644 --- a/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/android_alarm_manager/example/pubspec.yaml b/packages/android_alarm_manager/example/pubspec.yaml index c4d698bdde14..93cbc57d8de5 100644 --- a/packages/android_alarm_manager/example/pubspec.yaml +++ b/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: diff --git a/packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e.dart b/packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e.dart index a5bc1ac0ba48..4d2e3201eecf 100644 --- a/packages/android_alarm_manager/example/test_driver/android_alarm_manager_e2e.dart +++ b/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(); diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java index f239ae88e5d1..f591d86db253 100644 --- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java index 5352e447ee3e..4c8319927022 100644 --- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/android_intent/example/pubspec.yaml b/packages/android_intent/example/pubspec.yaml index 325a4c54ee5f..31d434e8c038 100644 --- a/packages/android_intent/example/pubspec.yaml +++ b/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 diff --git a/packages/android_intent/example/test_driver/android_intent_e2e.dart b/packages/android_intent/example/test_driver/android_intent_e2e.dart index 880e7efee76c..78a667b27a09 100644 --- a/packages/android_intent/example/test_driver/android_intent_e2e.dart +++ b/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()); diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java index 40fedbb889ba..c75610db850d 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java index 88aade36d064..64df46e3f837 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 7ccc9c1e2fd3..2e871681e657 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/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.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.battery.BatteryPlugin; @@ -14,6 +14,6 @@ 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.integrationTest.IntegrationTestPlugin")); } } diff --git a/packages/battery/example/pubspec.yaml b/packages/battery/example/pubspec.yaml index d0ef82ea071a..5ec38f6ce5c2 100644 --- a/packages/battery/example/pubspec.yaml +++ b/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: diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml index 487ee5b800ac..22cfdf6a078c 100644 --- a/packages/battery/pubspec.yaml +++ b/packages/battery/pubspec.yaml @@ -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: diff --git a/packages/battery/test/battery_e2e.dart b/packages/battery/test/battery_e2e.dart index 6ffc7e6541fb..ed7b6fe5a0e4 100644 --- a/packages/battery/test/battery_e2e.dart +++ b/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(); diff --git a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java index fd947a03f1b0..04ac80c79287 100644 --- a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java index e5eff70941fd..c45f653e8f5c 100644 --- a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index 76f47c500bcf..ddac12d0db30 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/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.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.camera.CameraPlugin; import io.flutter.plugins.pathprovider.PathProviderPlugin; @@ -12,7 +12,7 @@ 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.integrationTest.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); VideoPlayerPlugin.registerWith( diff --git a/packages/camera/example/pubspec.yaml b/packages/camera/example/pubspec.yaml index cbd0adc8a61c..bc33087a5877 100644 --- a/packages/camera/example/pubspec.yaml +++ b/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: diff --git a/packages/camera/example/test_driver/camera_e2e.dart b/packages/camera/example/test_driver/camera_e2e.dart index a1cc8ad9ca02..ef4646f5ced9 100644 --- a/packages/camera/example/test_driver/camera_e2e.dart +++ b/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(); diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java index edd544d5f6ea..839f272a836e 100644 --- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java +++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java index 0b0ee94c77b9..68fbf183fb29 100644 --- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java +++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity/example/pubspec.yaml b/packages/connectivity/connectivity/example/pubspec.yaml index fb8ba621af2a..1d07f7d19e60 100644 --- a/packages/connectivity/connectivity/example/pubspec.yaml +++ b/packages/connectivity/connectivity/example/pubspec.yaml @@ -11,8 +11,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e.dart b/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e.dart index 10c4bda34e0d..54a67337285a 100644 --- a/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e.dart +++ b/packages/connectivity/connectivity/example/test_driver/test/connectivity_e2e.dart @@ -3,12 +3,12 @@ // found in the LICENSE file. import 'dart:io'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:connectivity/connectivity.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('Connectivity test driver', () { Connectivity _connectivity; diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml index cfe47792ff18..bce5d5f831f9 100644 --- a/packages/connectivity/connectivity/pubspec.yaml +++ b/packages/connectivity/connectivity/pubspec.yaml @@ -34,8 +34,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test mockito: ^4.1.1 plugin_platform_interface: ^1.0.0 pedantic: ^1.8.0 diff --git a/packages/connectivity/connectivity/test/connectivity_e2e.dart b/packages/connectivity/connectivity/test/connectivity_e2e.dart index 10c4bda34e0d..54a67337285a 100644 --- a/packages/connectivity/connectivity/test/connectivity_e2e.dart +++ b/packages/connectivity/connectivity/test/connectivity_e2e.dart @@ -3,12 +3,12 @@ // found in the LICENSE file. import 'dart:io'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:connectivity/connectivity.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('Connectivity test driver', () { Connectivity _connectivity; diff --git a/packages/connectivity/connectivity_for_web/pubspec.yaml b/packages/connectivity/connectivity_for_web/pubspec.yaml index acb31c3e385b..1af35fda508b 100644 --- a/packages/connectivity/connectivity_for_web/pubspec.yaml +++ b/packages/connectivity/connectivity_for_web/pubspec.yaml @@ -23,8 +23,8 @@ dev_dependencies: sdk: flutter flutter_test: sdk: flutter - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test mockito: ^4.1.1 environment: diff --git a/packages/connectivity/connectivity_for_web/test/lib/main.dart b/packages/connectivity/connectivity_for_web/test/lib/main.dart index 93b9a73cf31b..e3473532553e 100644 --- a/packages/connectivity/connectivity_for_web/test/lib/main.dart +++ b/packages/connectivity/connectivity_for_web/test/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:connectivity_platform_interface/connectivity_platform_interface.dart'; import 'package:connectivity_for_web/src/network_information_api_connectivity_plugin.dart'; @@ -8,7 +8,7 @@ import 'package:mockito/mockito.dart'; import 'src/connectivity_mocks.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('checkConnectivity', () { void testCheckConnectivity({ diff --git a/packages/connectivity/connectivity_for_web/test/pubspec.yaml b/packages/connectivity/connectivity_for_web/test/pubspec.yaml index 7c423f39a9b9..ef3a9298668e 100644 --- a/packages/connectivity/connectivity_for_web/test/pubspec.yaml +++ b/packages/connectivity/connectivity_for_web/test/pubspec.yaml @@ -17,8 +17,8 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test mockito: ^4.1.1 environment: diff --git a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java index edd544d5f6ea..839f272a836e 100644 --- a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java +++ b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java index 0b0ee94c77b9..68fbf183fb29 100644 --- a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java +++ b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity_macos/example/pubspec.yaml b/packages/connectivity/connectivity_macos/example/pubspec.yaml index fd18be002bef..7faf3e2f67e7 100644 --- a/packages/connectivity/connectivity_macos/example/pubspec.yaml +++ b/packages/connectivity/connectivity_macos/example/pubspec.yaml @@ -12,8 +12,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/connectivity/connectivity_macos/example/test_driver/test/connectivity_e2e.dart b/packages/connectivity/connectivity_macos/example/test_driver/test/connectivity_e2e.dart index 10c4bda34e0d..54a67337285a 100644 --- a/packages/connectivity/connectivity_macos/example/test_driver/test/connectivity_e2e.dart +++ b/packages/connectivity/connectivity_macos/example/test_driver/test/connectivity_e2e.dart @@ -3,12 +3,12 @@ // found in the LICENSE file. import 'dart:io'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:connectivity/connectivity.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('Connectivity test driver', () { Connectivity _connectivity; diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java index c8fb26e7f70f..a9eecd1341de 100644 --- a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java +++ b/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.deviceinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/device_info/example/pubspec.yaml b/packages/device_info/example/pubspec.yaml index 0546cb650256..fdbfd774ce90 100644 --- a/packages/device_info/example/pubspec.yaml +++ b/packages/device_info/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: diff --git a/packages/device_info/example/test_driver/device_info_e2e.dart b/packages/device_info/example/test_driver/device_info_e2e.dart index db8a73f579c1..2fd1d9a9a491 100644 --- a/packages/device_info/example/test_driver/device_info_e2e.dart +++ b/packages/device_info/example/test_driver/device_info_e2e.dart @@ -5,10 +5,10 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:device_info/device_info.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); IosDeviceInfo iosInfo; AndroidDeviceInfo androidInfo; diff --git a/packages/e2e/android/settings.gradle b/packages/e2e/android/settings.gradle deleted file mode 100644 index e5d17d080b60..000000000000 --- a/packages/e2e/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'e2e' diff --git a/packages/e2e/example/ios/RunnerTests/RunnerTests.m b/packages/e2e/example/ios/RunnerTests/RunnerTests.m deleted file mode 100644 index 9614c6598b15..000000000000 --- a/packages/e2e/example/ios/RunnerTests/RunnerTests.m +++ /dev/null @@ -1,4 +0,0 @@ -#import -#import - -E2E_IOS_RUNNER(RunnerTests) diff --git a/packages/e2e/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/e2e/example/macos/Flutter/GeneratedPluginRegistrant.swift deleted file mode 100644 index 2b7c33cf9b20..000000000000 --- a/packages/e2e/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -import FlutterMacOS -import Foundation - -import e2e_macos - -func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { - E2EPlugin.register(with: registry.registrar(forPlugin: "E2EPlugin")) -} diff --git a/packages/e2e/example/test_driver/example_e2e_test.dart b/packages/e2e/example/test_driver/example_e2e_test.dart deleted file mode 100644 index cc3ea1572a52..000000000000 --- a/packages/e2e/example/test_driver/example_e2e_test.dart +++ /dev/null @@ -1,5 +0,0 @@ -import 'dart:async'; - -import 'package:e2e/e2e_driver.dart' as e2e; - -Future main() async => e2e.e2eDriver(); diff --git a/packages/e2e/ios/Classes/E2EIosTest.h b/packages/e2e/ios/Classes/E2EIosTest.h deleted file mode 100644 index 1d7651459419..000000000000 --- a/packages/e2e/ios/Classes/E2EIosTest.h +++ /dev/null @@ -1,22 +0,0 @@ -#import - -@interface E2EIosTest : NSObject - -- (BOOL)testE2E:(NSString **)testResult; - -@end - -#define E2E_IOS_RUNNER(__test_class) \ - @interface __test_class : XCTestCase \ - @end \ - \ - @implementation __test_class \ - \ - -(void)testE2E { \ - NSString *testResult; \ - E2EIosTest *e2eIosTest = [[E2EIosTest alloc] init]; \ - BOOL testPass = [e2eIosTest testE2E:&testResult]; \ - XCTAssertTrue(testPass, @"%@", testResult); \ - } \ - \ - @end diff --git a/packages/e2e/ios/Classes/E2EPlugin.h b/packages/e2e/ios/Classes/E2EPlugin.h deleted file mode 100644 index e1a99f1b5a8e..000000000000 --- a/packages/e2e/ios/Classes/E2EPlugin.h +++ /dev/null @@ -1,23 +0,0 @@ -#import - -NS_ASSUME_NONNULL_BEGIN - -/** A Flutter plugin that's responsible for communicating the test results back to iOS XCTest. */ -@interface E2EPlugin : NSObject - -/** - * Test results that are sent from Dart when E2E test completes. Before the completion, it is - * @c nil. - */ -@property(nonatomic, readonly, nullable) NSDictionary *testResults; - -/** Fetches the singleton instance of the plugin. */ -+ (E2EPlugin *)instance; - -- (void)setupChannels:(id)binaryMessenger; - -- (instancetype)init NS_UNAVAILABLE; - -@end - -NS_ASSUME_NONNULL_END diff --git a/packages/e2e/ios/Classes/E2EPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m deleted file mode 100644 index e025c2917201..000000000000 --- a/packages/e2e/ios/Classes/E2EPlugin.m +++ /dev/null @@ -1,53 +0,0 @@ -#import "E2EPlugin.h" - -static NSString *const kE2EPluginChannel = @"plugins.flutter.io/e2e"; -static NSString *const kMethodTestFinished = @"allTestsFinished"; - -@interface E2EPlugin () - -@property(nonatomic, readwrite) NSDictionary *testResults; - -@end - -@implementation E2EPlugin { - NSDictionary *_testResults; -} - -+ (E2EPlugin *)instance { - static dispatch_once_t onceToken; - static E2EPlugin *sInstance; - dispatch_once(&onceToken, ^{ - sInstance = [[E2EPlugin alloc] initForRegistration]; - }); - return sInstance; -} - -- (instancetype)initForRegistration { - return [super init]; -} - -+ (void)registerWithRegistrar:(NSObject *)registrar { - // No initialization happens here because of the way XCTest loads the testing - // bundles. Setup on static variables can be disregarded when a new static - // instance of E2EPlugin is allocated when the bundle is reloaded. - // See also: https://github.com/flutter/plugins/pull/2465 -} - -- (void)setupChannels:(id)binaryMessenger { - FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:kE2EPluginChannel - binaryMessenger:binaryMessenger]; - [channel setMethodCallHandler:^(FlutterMethodCall *call, FlutterResult result) { - [self handleMethodCall:call result:result]; - }]; -} - -- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result { - if ([kMethodTestFinished isEqual:call.method]) { - self.testResults = call.arguments[@"results"]; - result(nil); - } else { - result(FlutterMethodNotImplemented); - } -} - -@end diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java index cb699d587a99..987b67ba2610 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java index 7228115bf534..2760e227fca4 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index 0eb8bb9ad407..1532affbf6a0 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; @@ -9,7 +9,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java index 2ea33493eb3c..84883f690856 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java @@ -6,7 +6,7 @@ import android.util.Log; import androidx.lifecycle.Lifecycle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.plugins.FlutterPlugin; @@ -20,7 +20,7 @@ public class MainActivity extends FlutterActivity { @Override public void configureFlutterEngine(FlutterEngine flutterEngine) { flutterEngine.getPlugins().add(new TestPlugin()); - flutterEngine.getPlugins().add(new E2EPlugin()); + flutterEngine.getPlugins().add(new IntegrationTestPlugin()); } private static class TestPlugin implements FlutterPlugin, ActivityAware { diff --git a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml index cb5691b6ceb2..a040dbe95d92 100644 --- a/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml +++ b/packages/flutter_plugin_android_lifecycle/example/pubspec.yaml @@ -8,8 +8,8 @@ environment: dependencies: flutter: sdk: flutter - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test dev_dependencies: flutter_test: diff --git a/packages/flutter_plugin_android_lifecycle/example/test_driver/flutter_plugin_android_lifecycle_e2e.dart b/packages/flutter_plugin_android_lifecycle/example/test_driver/flutter_plugin_android_lifecycle_e2e.dart index 5abead07d132..1405ab69153c 100644 --- a/packages/flutter_plugin_android_lifecycle/example/test_driver/flutter_plugin_android_lifecycle_e2e.dart +++ b/packages/flutter_plugin_android_lifecycle/example/test_driver/flutter_plugin_android_lifecycle_e2e.dart @@ -3,11 +3,11 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_plugin_android_lifecycle_example/main.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('loads', (WidgetTester tester) async { await tester.pumpWidget(MyApp()); diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java index 6ce846749799..fef9d8383a27 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemaps; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.plugins.googlemapsexample.*; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java index 6b52f1c87585..375e47fea27a 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemaps; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index 8d7b3054bf5f..da27c735b3e3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemapsexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.googlemaps.GoogleMapsPlugin; @@ -10,6 +10,6 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); GoogleMapsPlugin.registerWith(registrarFor("io.flutter.plugins.googlemaps.GoogleMapsPlugin")); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); } } diff --git a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml index a011cb126d5e..7bfc7a6feb9c 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml +++ b/packages/google_maps_flutter/google_maps_flutter/example/pubspec.yaml @@ -16,8 +16,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: ^1.6.0 - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 # For information on the generic Dart part of this file, see the diff --git a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart index 69304d18778d..2a5bf80a4578 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart +++ b/packages/google_maps_flutter/google_maps_flutter/example/test_driver/google_maps_e2e.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:typed_data'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -20,7 +20,7 @@ const CameraPosition _kInitialCameraPosition = CameraPosition(target: _kInitialMapCenter, zoom: _kInitialZoomLevel); void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('testCompassToggle', (WidgetTester tester) async { final Key key = GlobalKey(); diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java index 92c29c5d2393..d67badfd61b3 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java index 21fe2cb9467a..2cb11396b34b 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml index fff936d9b5e0..3e64fa2da3f2 100755 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/pubspec.yaml @@ -11,8 +11,8 @@ dependencies: dev_dependencies: pedantic: ^1.8.0 - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java index 92c29c5d2393..d67badfd61b3 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java index 21fe2cb9467a..2cb11396b34b 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/google_sign_in/example/pubspec.yaml b/packages/google_sign_in/google_sign_in/example/pubspec.yaml index 37d109649c8a..ebf8e82719f2 100755 --- a/packages/google_sign_in/google_sign_in/example/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in/example/pubspec.yaml @@ -10,8 +10,8 @@ dependencies: dev_dependencies: pedantic: ^1.8.0 - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml index e76dbedfa116..bc9ea71fed8c 100644 --- a/packages/google_sign_in/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in/pubspec.yaml @@ -34,8 +34,8 @@ dev_dependencies: flutter_test: sdk: flutter pedantic: ^1.8.0 - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test environment: sdk: ">=2.1.0 <3.0.0" diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_e2e.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_e2e.dart index 0c6431f37bf4..7b2b8d800778 100644 --- a/packages/google_sign_in/google_sign_in/test/google_sign_in_e2e.dart +++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_e2e.dart @@ -1,9 +1,9 @@ -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:google_sign_in/google_sign_in.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can initialize the plugin', (WidgetTester tester) async { GoogleSignIn signIn = GoogleSignIn(); diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java index a9146dfa5716..6df2aa6c581d 100644 --- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java +++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.imagepickerexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java index 6afe01481ea4..47d833ccfba8 100644 --- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java +++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.imagepickerexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/image_picker/image_picker/example/pubspec.yaml b/packages/image_picker/image_picker/example/pubspec.yaml index 63e42a121d80..0ff2f280e2ab 100755 --- a/packages/image_picker/image_picker/example/pubspec.yaml +++ b/packages/image_picker/image_picker/example/pubspec.yaml @@ -14,8 +14,8 @@ dependencies: dev_dependencies: flutter_driver: sdk: flutter - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 94fa53be135e..1d752b8075ba 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -23,8 +23,8 @@ dev_dependencies: video_player: ^0.10.3 flutter_test: sdk: flutter - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test pedantic: ^1.8.0 environment: diff --git a/packages/image_picker/image_picker/test/old_image_picker_e2e.dart b/packages/image_picker/image_picker/test/old_image_picker_e2e.dart index b19e37dd6541..d21a4e0cdfa3 100644 --- a/packages/image_picker/image_picker/test/old_image_picker_e2e.dart +++ b/packages/image_picker/image_picker/test/old_image_picker_e2e.dart @@ -1,5 +1,5 @@ -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); } diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index 425c1661066b..504c435b3d0a 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.inapppurchase.InAppPurchasePlugin; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); InAppPurchasePlugin.registerWith( diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java index aaed781653da..c9dd6dff0717 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java index 1a6203bcd7a8..81c1d8f34ec1 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/in_app_purchase/example/pubspec.yaml b/packages/in_app_purchase/example/pubspec.yaml index 6d8fd0e90739..48359dbc6a06 100644 --- a/packages/in_app_purchase/example/pubspec.yaml +++ b/packages/in_app_purchase/example/pubspec.yaml @@ -14,8 +14,8 @@ dev_dependencies: sdk: flutter in_app_purchase: path: ../ - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml index 4b50721bf22b..31c4224ce2e5 100644 --- a/packages/in_app_purchase/pubspec.yaml +++ b/packages/in_app_purchase/pubspec.yaml @@ -22,8 +22,8 @@ dev_dependencies: path: example/ test: ^1.5.2 shared_preferences: ^0.5.2 - e2e: - path: ../e2e + integration_test: + path: ../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/in_app_purchase/test/in_app_purchase_e2e.dart b/packages/in_app_purchase/test/in_app_purchase_e2e.dart index e167227b4c8f..a5bfdb0eb409 100644 --- a/packages/in_app_purchase/test/in_app_purchase_e2e.dart +++ b/packages/in_app_purchase/test/in_app_purchase_e2e.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:in_app_purchase/in_app_purchase.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can create InAppPurchaseConnection instance', (WidgetTester tester) async { diff --git a/packages/e2e/.gitignore b/packages/integration_test/.gitignore similarity index 100% rename from packages/e2e/.gitignore rename to packages/integration_test/.gitignore diff --git a/packages/e2e/.metadata b/packages/integration_test/.metadata similarity index 100% rename from packages/e2e/.metadata rename to packages/integration_test/.metadata diff --git a/packages/e2e/CHANGELOG.md b/packages/integration_test/CHANGELOG.md similarity index 97% rename from packages/e2e/CHANGELOG.md rename to packages/integration_test/CHANGELOG.md index e48b95d099a7..990aa5536be1 100644 --- a/packages/e2e/CHANGELOG.md +++ b/packages/integration_test/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.0 + +* Rename plugin to integration_test. + ## 0.6.3 * Add customizable `flutter_driver` adaptor. @@ -148,7 +152,7 @@ * Renamed package from instrumentation_adapter to e2e. * Refactored example app test. * **Breaking change**. Renamed `InstrumentationAdapterFlutterBinding` to - `E2EWidgetsFlutterBinding`. + `IntegrationTestWidgetsFlutterBinding`. * Updated README. ## 0.1.4 diff --git a/packages/e2e/LICENSE b/packages/integration_test/LICENSE similarity index 100% rename from packages/e2e/LICENSE rename to packages/integration_test/LICENSE diff --git a/packages/e2e/README.md b/packages/integration_test/README.md similarity index 82% rename from packages/e2e/README.md rename to packages/integration_test/README.md index a9ebed1130a4..5218235cf9bc 100644 --- a/packages/e2e/README.md +++ b/packages/integration_test/README.md @@ -1,4 +1,4 @@ -# e2e +# integration_test This package enables self-driving testing of Flutter code on devices and emulators. It adapts flutter_test results into a format that is compatible with `flutter drive` @@ -8,18 +8,18 @@ iOS support is not available yet, but is planned in the future. ## Usage -Add a dependency on the `e2e` package in the +Add a dependency on the `integration_test` package in the `dev_dependencies` section of pubspec.yaml. For plugins, do this in the pubspec.yaml of the example app. -Invoke `E2EWidgetsFlutterBinding.ensureInitialized()` at the start +Invoke `IntegrationTestWidgetsFlutterBinding.ensureInitialized()` at the start of a test file, e.g. ```dart -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets("failing test example", (WidgetTester tester) async { expect(2 + 2, equals(5)); }); @@ -28,24 +28,27 @@ void main() { ## Test locations -It is recommended to put e2e tests in the `test/` folder of the app or package. -For example apps, if the e2e test references example app code, it should go in -`example/test/`. It is also acceptable to put e2e tests in `test_driver/` folder -so that they're alongside the runner app (see below). +It is recommended to put integration_test tests in the `test/` folder of the app +or package. For example apps, if the integration_test test references example +app code, it should go in `example/test/`. It is also acceptable to put +integration_test tests in `test_driver/` folder so that they're alongside the +runner app (see below). ## Using Flutter driver to run tests -`E2EWidgetsTestBinding` supports launching the on-device tests with `flutter drive`. -Note that the tests don't use the `FlutterDriver` API, they use `testWidgets` instead. +`IntegrationTestWidgetsTestBinding` supports launching the on-device tests with +`flutter drive`. Note that the tests don't use the `FlutterDriver` API, they +use `testWidgets` instead. -Put the a file named `_e2e_test.dart` in the app' `test_driver` directory: +Put the a file named `_integration_test.dart` in the app' +`test_driver` directory: ```dart import 'dart:async'; -import 'package:e2e/e2e_driver.dart' as e2e; +import 'package:integration_test/integration_test_driver.dart'; -Future main() async => e2e.main(); +Future main() async => integration_main(); ``` @@ -53,7 +56,7 @@ To run a example app test with Flutter driver: ``` cd example -flutter drive test/_e2e.dart +flutter drive test/_integration.dart ``` To test plugin APIs using Flutter driver: diff --git a/packages/e2e/android/.gitignore b/packages/integration_test/android/.gitignore similarity index 100% rename from packages/e2e/android/.gitignore rename to packages/integration_test/android/.gitignore diff --git a/packages/e2e/android/build.gradle b/packages/integration_test/android/build.gradle similarity index 95% rename from packages/e2e/android/build.gradle rename to packages/integration_test/android/build.gradle index d0bb6c5a5967..9f5a3896be0d 100644 --- a/packages/e2e/android/build.gradle +++ b/packages/integration_test/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.example.e2e' +group 'com.example.integration_test' version '1.0-SNAPSHOT' buildscript { diff --git a/packages/e2e/android/gradle.properties b/packages/integration_test/android/gradle.properties similarity index 100% rename from packages/e2e/android/gradle.properties rename to packages/integration_test/android/gradle.properties diff --git a/packages/integration_test/android/settings.gradle b/packages/integration_test/android/settings.gradle new file mode 100644 index 000000000000..1d010945f01e --- /dev/null +++ b/packages/integration_test/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'integrationTest' diff --git a/packages/e2e/android/src/main/AndroidManifest.xml b/packages/integration_test/android/src/main/AndroidManifest.xml similarity index 65% rename from packages/e2e/android/src/main/AndroidManifest.xml rename to packages/integration_test/android/src/main/AndroidManifest.xml index 33fdf86052ab..183e7fcd827c 100644 --- a/packages/e2e/android/src/main/AndroidManifest.xml +++ b/packages/integration_test/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.flutter.integration_test"> diff --git a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterTestRunner.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java similarity index 96% rename from packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterTestRunner.java rename to packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java index 78f0c3c5bac2..b5a5c54df1d2 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterTestRunner.java +++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.e2e; +package dev.flutter.plugins.integrationTest; import android.util.Log; import androidx.test.rule.ActivityTestRule; @@ -68,7 +68,7 @@ public void run(RunNotifier notifier) { } Map results = null; try { - results = E2EPlugin.testResults.get(); + results = IntegrationTestPlugin.testResults.get(); } catch (ExecutionException | InterruptedException e) { throw new IllegalThreadStateException("Unable to get test results"); } diff --git a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java similarity index 85% rename from packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java rename to packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java index 31100d442731..4ac21851809e 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java +++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.e2e; +package dev.flutter.plugins.integrationTest; import android.content.Context; import com.google.common.util.concurrent.SettableFuture; @@ -16,19 +16,19 @@ import java.util.Map; import java.util.concurrent.Future; -/** E2EPlugin */ -public class E2EPlugin implements MethodCallHandler, FlutterPlugin { +/** IntegrationTestPlugin */ +public class IntegrationTestPlugin implements MethodCallHandler, FlutterPlugin { private MethodChannel methodChannel; private static final SettableFuture> testResultsSettable = SettableFuture.create(); public static final Future> testResults = testResultsSettable; - private static final String CHANNEL = "plugins.flutter.io/e2e"; + private static final String CHANNEL = "plugins.flutter.io/integration_test"; /** Plugin registration. */ public static void registerWith(Registrar registrar) { - final E2EPlugin instance = new E2EPlugin(); + final IntegrationTestPlugin instance = new IntegrationTestPlugin(); instance.onAttachedToEngine(registrar.context(), registrar.messenger()); } @@ -38,7 +38,7 @@ public void onAttachedToEngine(FlutterPluginBinding binding) { } private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { - methodChannel = new MethodChannel(messenger, "plugins.flutter.io/e2e"); + methodChannel = new MethodChannel(messenger, "plugins.flutter.io/integration_test"); methodChannel.setMethodCallHandler(this); } diff --git a/packages/e2e/example/.gitignore b/packages/integration_test/example/.gitignore similarity index 100% rename from packages/e2e/example/.gitignore rename to packages/integration_test/example/.gitignore diff --git a/packages/e2e/example/.metadata b/packages/integration_test/example/.metadata similarity index 100% rename from packages/e2e/example/.metadata rename to packages/integration_test/example/.metadata diff --git a/packages/e2e/example/README.md b/packages/integration_test/example/README.md similarity index 100% rename from packages/e2e/example/README.md rename to packages/integration_test/example/README.md diff --git a/packages/e2e/example/android/app/build.gradle b/packages/integration_test/example/android/app/build.gradle similarity index 96% rename from packages/e2e/example/android/app/build.gradle rename to packages/integration_test/example/android/app/build.gradle index 527ed2dd38e0..73bd5f4bc41e 100644 --- a/packages/e2e/example/android/app/build.gradle +++ b/packages/integration_test/example/android/app/build.gradle @@ -33,7 +33,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.e2e_example" + applicationId "com.example.integration_test_example" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java similarity index 73% rename from packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java rename to packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java index eedde293eb6c..48d59d394592 100644 --- a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java @@ -1,7 +1,7 @@ -package com.example.e2e_example; +package com.example.integration_test_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java similarity index 76% rename from packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java rename to packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java index 86d552733332..ea3de1e7cb9c 100644 --- a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java @@ -1,7 +1,7 @@ -package com.example.e2e_example; +package com.example.integration_test_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java similarity index 77% rename from packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java rename to packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java index 73c3780f4e55..525d08ab65e6 100644 --- a/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java @@ -1,15 +1,15 @@ -package com.example.e2e_example; +package com.example.integration_test_example; import android.Manifest.permission; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; /** - * Demonstrates how a E2E test on Android can be run with permissions already granted. This is + * Demonstrates how an integration test on Android can be run with permissions already granted. This is * helpful if developers want to test native App behavior that depends on certain system service * results which are guarded with permissions. */ diff --git a/packages/e2e/example/android/app/src/debug/AndroidManifest.xml b/packages/integration_test/example/android/app/src/debug/AndroidManifest.xml similarity index 84% rename from packages/e2e/example/android/app/src/debug/AndroidManifest.xml rename to packages/integration_test/example/android/app/src/debug/AndroidManifest.xml index 5d4aea26b1dd..04d0fdb2c153 100644 --- a/packages/e2e/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/integration_test/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.integration_test_example"> diff --git a/packages/e2e/example/android/app/src/main/AndroidManifest.xml b/packages/integration_test/example/android/app/src/main/AndroidManifest.xml similarity index 94% rename from packages/e2e/example/android/app/src/main/AndroidManifest.xml rename to packages/integration_test/example/android/app/src/main/AndroidManifest.xml index 4710b796c0f5..d789e0e15faf 100644 --- a/packages/e2e/example/android/app/src/main/AndroidManifest.xml +++ b/packages/integration_test/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.integration_test_example"> + package="com.example.integration_test_example"> diff --git a/packages/e2e/example/android/build.gradle b/packages/integration_test/example/android/build.gradle similarity index 100% rename from packages/e2e/example/android/build.gradle rename to packages/integration_test/example/android/build.gradle diff --git a/packages/e2e/example/android/gradle.properties b/packages/integration_test/example/android/gradle.properties similarity index 100% rename from packages/e2e/example/android/gradle.properties rename to packages/integration_test/example/android/gradle.properties diff --git a/packages/e2e/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/integration_test/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/e2e/example/android/gradle/wrapper/gradle-wrapper.properties rename to packages/integration_test/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/e2e/example/android/settings.gradle b/packages/integration_test/example/android/settings.gradle similarity index 100% rename from packages/e2e/example/android/settings.gradle rename to packages/integration_test/example/android/settings.gradle diff --git a/packages/e2e/example/ios/Flutter/AppFrameworkInfo.plist b/packages/integration_test/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from packages/e2e/example/ios/Flutter/AppFrameworkInfo.plist rename to packages/integration_test/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/packages/e2e/example/ios/Flutter/Debug.xcconfig b/packages/integration_test/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from packages/e2e/example/ios/Flutter/Debug.xcconfig rename to packages/integration_test/example/ios/Flutter/Debug.xcconfig diff --git a/packages/e2e/example/ios/Flutter/Release.xcconfig b/packages/integration_test/example/ios/Flutter/Release.xcconfig similarity index 100% rename from packages/e2e/example/ios/Flutter/Release.xcconfig rename to packages/integration_test/example/ios/Flutter/Release.xcconfig diff --git a/packages/e2e/example/ios/Runner.xcodeproj/project.pbxproj b/packages/integration_test/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from packages/e2e/example/ios/Runner.xcodeproj/project.pbxproj rename to packages/integration_test/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/packages/e2e/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/integration_test/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from packages/e2e/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/integration_test/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/packages/e2e/example/ios/Runner/AppDelegate.h b/packages/integration_test/example/ios/Runner/AppDelegate.h similarity index 100% rename from packages/e2e/example/ios/Runner/AppDelegate.h rename to packages/integration_test/example/ios/Runner/AppDelegate.h diff --git a/packages/e2e/example/ios/Runner/AppDelegate.m b/packages/integration_test/example/ios/Runner/AppDelegate.m similarity index 100% rename from packages/e2e/example/ios/Runner/AppDelegate.m rename to packages/integration_test/example/ios/Runner/AppDelegate.m diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/integration_test/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/packages/e2e/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/integration_test/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from packages/e2e/example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/integration_test/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/packages/e2e/example/ios/Runner/Base.lproj/Main.storyboard b/packages/integration_test/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from packages/e2e/example/ios/Runner/Base.lproj/Main.storyboard rename to packages/integration_test/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/packages/e2e/example/ios/Runner/Info.plist b/packages/integration_test/example/ios/Runner/Info.plist similarity index 97% rename from packages/e2e/example/ios/Runner/Info.plist rename to packages/integration_test/example/ios/Runner/Info.plist index 62f6fbb5c02c..d0e099be56e7 100644 --- a/packages/e2e/example/ios/Runner/Info.plist +++ b/packages/integration_test/example/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - e2e_example + integration_test_example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/packages/e2e/example/ios/Runner/main.m b/packages/integration_test/example/ios/Runner/main.m similarity index 100% rename from packages/e2e/example/ios/Runner/main.m rename to packages/integration_test/example/ios/Runner/main.m diff --git a/packages/e2e/example/ios/RunnerTests/Info.plist b/packages/integration_test/example/ios/RunnerTests/Info.plist similarity index 100% rename from packages/e2e/example/ios/RunnerTests/Info.plist rename to packages/integration_test/example/ios/RunnerTests/Info.plist diff --git a/packages/integration_test/example/ios/RunnerTests/RunnerTests.m b/packages/integration_test/example/ios/RunnerTests/RunnerTests.m new file mode 100644 index 000000000000..a30374f9f8ea --- /dev/null +++ b/packages/integration_test/example/ios/RunnerTests/RunnerTests.m @@ -0,0 +1,4 @@ +#import +#import + +INTEGRATION_TEST_IOS_RUNNER(RunnerTests) diff --git a/packages/e2e/example/lib/main.dart b/packages/integration_test/example/lib/main.dart similarity index 100% rename from packages/e2e/example/lib/main.dart rename to packages/integration_test/example/lib/main.dart diff --git a/packages/e2e/example/lib/my_app.dart b/packages/integration_test/example/lib/my_app.dart similarity index 100% rename from packages/e2e/example/lib/my_app.dart rename to packages/integration_test/example/lib/my_app.dart diff --git a/packages/e2e/example/lib/my_web_app.dart b/packages/integration_test/example/lib/my_web_app.dart similarity index 100% rename from packages/e2e/example/lib/my_web_app.dart rename to packages/integration_test/example/lib/my_web_app.dart diff --git a/packages/e2e/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/integration_test/example/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from packages/e2e/example/macos/Flutter/Flutter-Debug.xcconfig rename to packages/integration_test/example/macos/Flutter/Flutter-Debug.xcconfig diff --git a/packages/e2e/example/macos/Flutter/Flutter-Release.xcconfig b/packages/integration_test/example/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from packages/e2e/example/macos/Flutter/Flutter-Release.xcconfig rename to packages/integration_test/example/macos/Flutter/Flutter-Release.xcconfig diff --git a/packages/e2e/example/macos/Runner.xcodeproj/project.pbxproj b/packages/integration_test/example/macos/Runner.xcodeproj/project.pbxproj similarity index 98% rename from packages/e2e/example/macos/Runner.xcodeproj/project.pbxproj rename to packages/integration_test/example/macos/Runner.xcodeproj/project.pbxproj index 73b46daf7715..718462e3b4c5 100644 --- a/packages/e2e/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/integration_test/example/macos/Runner.xcodeproj/project.pbxproj @@ -62,7 +62,7 @@ 2A162B3576CC7562C04C8319 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* e2e_example_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = e2e_example_example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* integration_test_example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = integration_test_example.app; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -132,7 +132,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* e2e_example_example.app */, + 33CC10ED2044A3C60003C045 /* integration_test_example.app */, ); name = Products; sourceTree = ""; @@ -204,7 +204,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* e2e_example_example.app */; + productReference = 33CC10ED2044A3C60003C045 /* integration_test_example.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ diff --git a/packages/e2e/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/integration_test/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 93% rename from packages/e2e/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/integration_test/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index b0cc6c6e2166..464e05225e4c 100644 --- a/packages/e2e/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/integration_test/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -43,7 +43,7 @@ @@ -66,7 +66,7 @@ @@ -85,7 +85,7 @@ diff --git a/packages/e2e/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/integration_test/example/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/e2e/example/macos/Runner.xcworkspace/contents.xcworkspacedata rename to packages/integration_test/example/macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/packages/e2e/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/integration_test/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/e2e/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/integration_test/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/e2e/example/macos/Runner/AppDelegate.swift b/packages/integration_test/example/macos/Runner/AppDelegate.swift similarity index 100% rename from packages/e2e/example/macos/Runner/AppDelegate.swift rename to packages/integration_test/example/macos/Runner/AppDelegate.swift diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from packages/e2e/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to packages/integration_test/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/packages/e2e/example/macos/Runner/Base.lproj/MainMenu.xib b/packages/integration_test/example/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from packages/e2e/example/macos/Runner/Base.lproj/MainMenu.xib rename to packages/integration_test/example/macos/Runner/Base.lproj/MainMenu.xib diff --git a/packages/e2e/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/integration_test/example/macos/Runner/Configs/AppInfo.xcconfig similarity index 83% rename from packages/e2e/example/macos/Runner/Configs/AppInfo.xcconfig rename to packages/integration_test/example/macos/Runner/Configs/AppInfo.xcconfig index 8a3359f80a49..1d9e2f0e043c 100644 --- a/packages/e2e/example/macos/Runner/Configs/AppInfo.xcconfig +++ b/packages/integration_test/example/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = e2e_example_example +PRODUCT_NAME = integration_test_example // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.e2eExample +PRODUCT_BUNDLE_IDENTIFIER = com.example.integrationTestExample // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2019 com.example. All rights reserved. diff --git a/packages/e2e/example/macos/Runner/Configs/Debug.xcconfig b/packages/integration_test/example/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from packages/e2e/example/macos/Runner/Configs/Debug.xcconfig rename to packages/integration_test/example/macos/Runner/Configs/Debug.xcconfig diff --git a/packages/e2e/example/macos/Runner/Configs/Release.xcconfig b/packages/integration_test/example/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from packages/e2e/example/macos/Runner/Configs/Release.xcconfig rename to packages/integration_test/example/macos/Runner/Configs/Release.xcconfig diff --git a/packages/e2e/example/macos/Runner/Configs/Warnings.xcconfig b/packages/integration_test/example/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from packages/e2e/example/macos/Runner/Configs/Warnings.xcconfig rename to packages/integration_test/example/macos/Runner/Configs/Warnings.xcconfig diff --git a/packages/e2e/example/macos/Runner/DebugProfile.entitlements b/packages/integration_test/example/macos/Runner/DebugProfile.entitlements similarity index 100% rename from packages/e2e/example/macos/Runner/DebugProfile.entitlements rename to packages/integration_test/example/macos/Runner/DebugProfile.entitlements diff --git a/packages/e2e/example/macos/Runner/Info.plist b/packages/integration_test/example/macos/Runner/Info.plist similarity index 100% rename from packages/e2e/example/macos/Runner/Info.plist rename to packages/integration_test/example/macos/Runner/Info.plist diff --git a/packages/e2e/example/macos/Runner/MainFlutterWindow.swift b/packages/integration_test/example/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from packages/e2e/example/macos/Runner/MainFlutterWindow.swift rename to packages/integration_test/example/macos/Runner/MainFlutterWindow.swift diff --git a/packages/e2e/example/macos/Runner/Release.entitlements b/packages/integration_test/example/macos/Runner/Release.entitlements similarity index 100% rename from packages/e2e/example/macos/Runner/Release.entitlements rename to packages/integration_test/example/macos/Runner/Release.entitlements diff --git a/packages/e2e/example/pubspec.yaml b/packages/integration_test/example/pubspec.yaml similarity index 71% rename from packages/e2e/example/pubspec.yaml rename to packages/integration_test/example/pubspec.yaml index 9ef6098477e3..9384e9763935 100644 --- a/packages/e2e/example/pubspec.yaml +++ b/packages/integration_test/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: e2e_example -description: Demonstrates how to use the e2e plugin. +name: integration_test_example +description: Demonstrates how to use the integration_test plugin. publish_to: 'none' environment: @@ -17,10 +17,10 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - e2e: + integration_test: path: ../ - e2e_macos: - path: ../e2e_macos + integration_test_macos: + path: ../integration_test_macos test: any pedantic: ^1.8.0 diff --git a/packages/e2e/example/test_driver/example_e2e.dart b/packages/integration_test/example/test_driver/example_integration.dart similarity index 66% rename from packages/e2e/example/test_driver/example_e2e.dart rename to packages/integration_test/example/test_driver/example_integration.dart index d97702d5d7cf..c2aea5234ca6 100644 --- a/packages/e2e/example/test_driver/example_e2e.dart +++ b/packages/integration_test/example/test_driver/example_integration.dart @@ -5,12 +5,12 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; -import 'example_e2e_io.dart' if (dart.library.html) 'example_e2e_web.dart' +import 'example_integration_io.dart' if (dart.library.html) 'example_integration_web.dart' as tests; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); tests.main(); } diff --git a/packages/e2e/example/test_driver/example_e2e_io.dart b/packages/integration_test/example/test_driver/example_integration_io.dart similarity index 84% rename from packages/e2e/example/test_driver/example_e2e_io.dart rename to packages/integration_test/example/test_driver/example_integration_io.dart index 9766f568b654..35fc7271d841 100644 --- a/packages/e2e/example/test_driver/example_e2e_io.dart +++ b/packages/integration_test/example/test_driver/example_integration_io.dart @@ -8,12 +8,12 @@ import 'dart:io' show Platform; 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:e2e_example/main.dart' as app; +import 'package:integration_test_example/main.dart' as app; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('verify text', (WidgetTester tester) async { // Build our app and trigger a frame. app.main(); diff --git a/packages/integration_test/example/test_driver/example_integration_test.dart b/packages/integration_test/example/test_driver/example_integration_test.dart new file mode 100644 index 000000000000..10acaa69a42e --- /dev/null +++ b/packages/integration_test/example/test_driver/example_integration_test.dart @@ -0,0 +1,5 @@ +import 'dart:async'; + +import 'package:integration_test/integration_test_driver.dart'; + +Future main() async => integrationDriver(); diff --git a/packages/e2e/example/test_driver/example_e2e_web.dart b/packages/integration_test/example/test_driver/example_integration_web.dart similarity index 84% rename from packages/e2e/example/test_driver/example_e2e_web.dart rename to packages/integration_test/example/test_driver/example_integration_web.dart index 24c3f2cbb2a4..e1141cc010c8 100644 --- a/packages/e2e/example/test_driver/example_e2e_web.dart +++ b/packages/integration_test/example/test_driver/example_integration_web.dart @@ -8,12 +8,12 @@ import 'dart:html' as html; 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:e2e_example/main.dart' as app; +import 'package:integration_test_example/main.dart' as app; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('verify text', (WidgetTester tester) async { // Build our app and trigger a frame. app.main(); diff --git a/packages/e2e/example/test_driver/failure.dart b/packages/integration_test/example/test_driver/failure.dart similarity index 79% rename from packages/e2e/example/test_driver/failure.dart rename to packages/integration_test/example/test_driver/failure.dart index ddeeb800bb06..ffb569f75fbb 100644 --- a/packages/e2e/example/test_driver/failure.dart +++ b/packages/integration_test/example/test_driver/failure.dart @@ -4,16 +4,16 @@ 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:e2e_example/main.dart' as app; +import 'package:integration_test_example/main.dart' as app; -// Tests the failure behavior of the E2EWidgetsFlutterBinding +// Tests the failure behavior of the IntegrationTestWidgetsFlutterBinding // // This test fails intentionally! It should be run using a test runner that // expects failure. void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('success', (WidgetTester tester) async { expect(1 + 1, 2); // This should pass diff --git a/packages/e2e/example/test_driver/failure_test.dart b/packages/integration_test/example/test_driver/failure_test.dart similarity index 89% rename from packages/e2e/example/test_driver/failure_test.dart rename to packages/integration_test/example/test_driver/failure_test.dart index a828df6242d7..bd9302f39409 100644 --- a/packages/e2e/example/test_driver/failure_test.dart +++ b/packages/integration_test/example/test_driver/failure_test.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:e2e/common.dart' as common; +import 'package:integration_test/common.dart' as common; import 'package:flutter_driver/flutter_driver.dart'; import 'package:test/test.dart'; diff --git a/packages/e2e/example/web/favicon.png b/packages/integration_test/example/web/favicon.png similarity index 100% rename from packages/e2e/example/web/favicon.png rename to packages/integration_test/example/web/favicon.png diff --git a/packages/e2e/example/web/icons/Icon-192.png b/packages/integration_test/example/web/icons/Icon-192.png similarity index 100% rename from packages/e2e/example/web/icons/Icon-192.png rename to packages/integration_test/example/web/icons/Icon-192.png diff --git a/packages/e2e/example/web/icons/Icon-512.png b/packages/integration_test/example/web/icons/Icon-512.png similarity index 100% rename from packages/e2e/example/web/icons/Icon-512.png rename to packages/integration_test/example/web/icons/Icon-512.png diff --git a/packages/e2e/example/web/index.html b/packages/integration_test/example/web/index.html similarity index 100% rename from packages/e2e/example/web/index.html rename to packages/integration_test/example/web/index.html diff --git a/packages/e2e/example/web/manifest.json b/packages/integration_test/example/web/manifest.json similarity index 100% rename from packages/e2e/example/web/manifest.json rename to packages/integration_test/example/web/manifest.json diff --git a/packages/e2e/e2e_macos/CHANGELOG.md b/packages/integration_test/integration_test_macos/CHANGELOG.md similarity index 59% rename from packages/e2e/e2e_macos/CHANGELOG.md rename to packages/integration_test/integration_test_macos/CHANGELOG.md index a49173cad15e..ab4bac1a3f3f 100644 --- a/packages/e2e/e2e_macos/CHANGELOG.md +++ b/packages/integration_test/integration_test_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.2 + +* Renames package to integration_test_macos. + ## 0.0.1+1 * Remove Android folder from `e2e_macos`. diff --git a/packages/e2e/e2e_macos/LICENSE b/packages/integration_test/integration_test_macos/LICENSE similarity index 100% rename from packages/e2e/e2e_macos/LICENSE rename to packages/integration_test/integration_test_macos/LICENSE diff --git a/packages/e2e/e2e_macos/ios/e2e_macos.podspec b/packages/integration_test/integration_test_macos/ios/integration_test_macos.podspec similarity index 68% rename from packages/e2e/e2e_macos/ios/e2e_macos.podspec rename to packages/integration_test/integration_test_macos/ios/integration_test_macos.podspec index 561933b15d08..7294590a6479 100644 --- a/packages/e2e/e2e_macos/ios/e2e_macos.podspec +++ b/packages/integration_test/integration_test_macos/ios/integration_test_macos.podspec @@ -2,14 +2,14 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'e2e_macos' + s.name = 'IntegrationTestMacOS' s.version = '0.0.1' - s.summary = 'No-op implementation of the e2e desktop plugin to avoid build issues on iOS' + s.summary = 'No-op implementation of the integration_test desktop plugin to avoid build issues on iOS' s.description = <<-DESC - No-op implementation of e2e to avoid build issues on iOS. + No-op implementation of integration to avoid build issues on iOS. See https://github.com/flutter/flutter/issues/39659 DESC - s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/e2e/e2e_macos' + s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/integration_test/integration_test_macos' s.license = { :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } s.source = { :path => '.' } diff --git a/packages/e2e/e2e_macos/macos/Assets/.gitkeep b/packages/integration_test/integration_test_macos/macos/Assets/.gitkeep similarity index 100% rename from packages/e2e/e2e_macos/macos/Assets/.gitkeep rename to packages/integration_test/integration_test_macos/macos/Assets/.gitkeep diff --git a/packages/e2e/e2e_macos/macos/Classes/E2EPlugin.swift b/packages/integration_test/integration_test_macos/macos/Classes/IntegrationTestPlugin.swift similarity index 75% rename from packages/e2e/e2e_macos/macos/Classes/E2EPlugin.swift rename to packages/integration_test/integration_test_macos/macos/Classes/IntegrationTestPlugin.swift index c3a80a9bcdbd..b4eb5fc410d5 100644 --- a/packages/e2e/e2e_macos/macos/Classes/E2EPlugin.swift +++ b/packages/integration_test/integration_test_macos/macos/Classes/IntegrationTestPlugin.swift @@ -1,13 +1,13 @@ import FlutterMacOS -public class E2EPlugin: NSObject, FlutterPlugin { +public class IntegrationTestPlugin: NSObject, FlutterPlugin { public static func register(with registrar: FlutterPluginRegistrar) { let channel = FlutterMethodChannel( - name: "plugins.flutter.io/e2e", + name: "plugins.flutter.io/integration_test", binaryMessenger: registrar.messenger) - let instance = E2EPlugin() + let instance = IntegrationTestPlugin() registrar.addMethodCallDelegate(instance, channel: channel) } diff --git a/packages/e2e/e2e_macos/macos/e2e_macos.podspec b/packages/integration_test/integration_test_macos/macos/integration_test_macos.podspec similarity index 77% rename from packages/e2e/e2e_macos/macos/e2e_macos.podspec rename to packages/integration_test/integration_test_macos/macos/integration_test_macos.podspec index c92addd8ba07..74bf66321319 100644 --- a/packages/e2e/e2e_macos/macos/e2e_macos.podspec +++ b/packages/integration_test/integration_test_macos/macos/integration_test_macos.podspec @@ -2,16 +2,16 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'e2e_macos' + s.name = 'IntegrationTestMacOS' s.version = '0.0.1' - s.summary = 'Adapter for e2e tests.' + s.summary = 'Adapter for integration tests.' s.description = <<-DESC Runs tests that use the flutter_test API as integration tests on macOS. DESC - s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/e2e/e2e_macos' + s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/integration_test/integration_test_macos' s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/master/packages/e2e' } + s.source = { :http => 'https://github.com/flutter/plugins/tree/master/packages/integration_test' } s.source_files = 'Classes/**/*' s.dependency 'FlutterMacOS' diff --git a/packages/e2e/e2e_macos/pubspec.yaml b/packages/integration_test/integration_test_macos/pubspec.yaml similarity index 62% rename from packages/e2e/e2e_macos/pubspec.yaml rename to packages/integration_test/integration_test_macos/pubspec.yaml index e026f32d3b0c..46510e32b94a 100644 --- a/packages/e2e/e2e_macos/pubspec.yaml +++ b/packages/integration_test/integration_test_macos/pubspec.yaml @@ -1,14 +1,14 @@ -name: e2e_macos -description: Desktop implementation of e2e plugin +name: integration_test_macos +description: Desktop implementation of integration_test plugin version: 0.0.1+1 author: Flutter Team -homepage: https://github.com/flutter/plugins/tree/master/packages/e2e/e2e_macos +homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test/integration_test_macos flutter: plugin: platforms: macos: - pluginClass: E2EPlugin + pluginClass: IntegrationTestPlugin environment: sdk: ">=2.1.0 <3.0.0" diff --git a/packages/e2e/ios/.gitignore b/packages/integration_test/ios/.gitignore similarity index 100% rename from packages/e2e/ios/.gitignore rename to packages/integration_test/ios/.gitignore diff --git a/packages/e2e/ios/Assets/.gitkeep b/packages/integration_test/ios/Assets/.gitkeep similarity index 100% rename from packages/e2e/ios/Assets/.gitkeep rename to packages/integration_test/ios/Assets/.gitkeep diff --git a/packages/integration_test/ios/Classes/IntegrationTestIosTest.h b/packages/integration_test/ios/Classes/IntegrationTestIosTest.h new file mode 100644 index 000000000000..bd17f634d702 --- /dev/null +++ b/packages/integration_test/ios/Classes/IntegrationTestIosTest.h @@ -0,0 +1,23 @@ +#import + +@interface IntegrationTestIosTest : NSObject + +- (BOOL)testIntegrationTest:(NSString **)testResult; + +@end + +#define INTEGRATION_TEST_IOS_RUNNER(__test_class) \ + @interface __test_class : XCTestCase \ + @end \ + \ + @implementation __test_class \ + \ + -(void)testIntegrationTest { \ + NSString *testResult; \ + IntegrationTestIosTest *integrationTestIosTest = \ + [[IntegrationTestIosTest alloc] init]; \ + BOOL testPass = [integrationTestIosTest testIntegrationTest:&testResult]; \ + XCTAssertTrue(testPass, @"%@", testResult); \ + } \ + \ + @end diff --git a/packages/e2e/ios/Classes/E2EIosTest.m b/packages/integration_test/ios/Classes/IntegrationTestIosTest.m similarity index 51% rename from packages/e2e/ios/Classes/E2EIosTest.m rename to packages/integration_test/ios/Classes/IntegrationTestIosTest.m index b788780d87e7..2716e9585cfa 100644 --- a/packages/e2e/ios/Classes/E2EIosTest.m +++ b/packages/integration_test/ios/Classes/IntegrationTestIosTest.m @@ -1,22 +1,27 @@ -#import "E2EIosTest.h" -#import "E2EPlugin.h" +#import "IntegrationTestIosTest.h" +#import "IntegrationTestPlugin.h" -@implementation E2EIosTest +@implementation IntegrationTestIosTest -- (BOOL)testE2E:(NSString **)testResult { - E2EPlugin *e2ePlugin = [E2EPlugin instance]; +- (BOOL)testIntegrationTest:(NSString **)testResult { + IntegrationTestPlugin *integrationTestPlugin = + [IntegrationTestPlugin instance]; UIViewController *rootViewController = - [[[[UIApplication sharedApplication] delegate] window] rootViewController]; + [[[[UIApplication sharedApplication] delegate] window] + rootViewController]; if (![rootViewController isKindOfClass:[FlutterViewController class]]) { NSLog(@"expected FlutterViewController as rootViewController."); return NO; } - FlutterViewController *flutterViewController = (FlutterViewController *)rootViewController; - [e2ePlugin setupChannels:flutterViewController.engine.binaryMessenger]; - while (!e2ePlugin.testResults) { + FlutterViewController *flutterViewController = + (FlutterViewController *)rootViewController; + [integrationTestPlugin + setupChannels:flutterViewController.engine.binaryMessenger]; + while (!integrationTestPlugin.testResults) { CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.f, NO); } - NSDictionary *testResults = e2ePlugin.testResults; + NSDictionary *testResults = + integrationTestPlugin.testResults; NSMutableArray *passedTests = [NSMutableArray array]; NSMutableArray *failedTests = [NSMutableArray array]; NSLog(@"==================== Test Results ====================="); @@ -33,9 +38,10 @@ - (BOOL)testE2E:(NSString **)testResult { NSLog(@"================== Test Results End ===================="); BOOL testPass = failedTests.count == 0; if (!testPass && testResult) { - *testResult = - [NSString stringWithFormat:@"Detected failed E2E test(s) %@ among %@", - failedTests.description, testResults.allKeys.description]; + *testResult = [NSString + stringWithFormat:@"Detected failed integration test(s) %@ among %@", + failedTests.description, + testResults.allKeys.description]; } return testPass; } diff --git a/packages/integration_test/ios/Classes/IntegrationTestPlugin.h b/packages/integration_test/ios/Classes/IntegrationTestPlugin.h new file mode 100644 index 000000000000..d4d8ee540990 --- /dev/null +++ b/packages/integration_test/ios/Classes/IntegrationTestPlugin.h @@ -0,0 +1,26 @@ +#import + +NS_ASSUME_NONNULL_BEGIN + +/** A Flutter plugin that's responsible for communicating the test results back + * to iOS XCTest. */ +@interface IntegrationTestPlugin : NSObject + +/** + * Test results that are sent from Dart when integration test completes. Before the + * completion, it is + * @c nil. + */ +@property(nonatomic, readonly, nullable) + NSDictionary *testResults; + +/** Fetches the singleton instance of the plugin. */ ++ (IntegrationTestPlugin *)instance; + +- (void)setupChannels:(id)binaryMessenger; + +- (instancetype)init NS_UNAVAILABLE; + +@end + +NS_ASSUME_NONNULL_END diff --git a/packages/integration_test/ios/Classes/IntegrationTestPlugin.m b/packages/integration_test/ios/Classes/IntegrationTestPlugin.m new file mode 100644 index 000000000000..5c31d27633d5 --- /dev/null +++ b/packages/integration_test/ios/Classes/IntegrationTestPlugin.m @@ -0,0 +1,58 @@ +#import "IntegrationTestPlugin.h" + +static NSString *const kIntegrationTestPluginChannel = + @"plugins.flutter.io/integratoin_test"; +static NSString *const kMethodTestFinished = @"allTestsFinished"; + +@interface IntegrationTestPlugin () + +@property(nonatomic, readwrite) + NSDictionary *testResults; + +@end + +@implementation IntegrationTestPlugin { + NSDictionary *_testResults; +} + ++ (IntegrationTestPlugin *)instance { + static dispatch_once_t onceToken; + static IntegrationTestPlugin *sInstance; + dispatch_once(&onceToken, ^{ + sInstance = [[IntegrationTestPlugin alloc] initForRegistration]; + }); + return sInstance; +} + +- (instancetype)initForRegistration { + return [super init]; +} + ++ (void)registerWithRegistrar:(NSObject *)registrar { + // No initialization happens here because of the way XCTest loads the testing + // bundles. Setup on static variables can be disregarded when a new static + // instance of IntegrationTestPlugin is allocated when the bundle is reloaded. + // See also: https://github.com/flutter/plugins/pull/2465 +} + +- (void)setupChannels:(id)binaryMessenger { + FlutterMethodChannel *channel = + [FlutterMethodChannel methodChannelWithName:kIntegrationTestPluginChannel + binaryMessenger:binaryMessenger]; + [channel + setMethodCallHandler:^(FlutterMethodCall *call, FlutterResult result) { + [self handleMethodCall:call result:result]; + }]; +} + +- (void)handleMethodCall:(FlutterMethodCall *)call + result:(FlutterResult)result { + if ([kMethodTestFinished isEqual:call.method]) { + self.testResults = call.arguments[@"results"]; + result(nil); + } else { + result(FlutterMethodNotImplemented); + } +} + +@end diff --git a/packages/e2e/ios/e2e.podspec b/packages/integration_test/ios/integration_test.podspec similarity index 81% rename from packages/e2e/ios/e2e.podspec rename to packages/integration_test/ios/integration_test.podspec index 0a6a6915607d..c38078b3da74 100644 --- a/packages/e2e/ios/e2e.podspec +++ b/packages/integration_test/ios/integration_test.podspec @@ -2,16 +2,16 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'e2e' + s.name = 'IntegrationTest' s.version = '0.0.1' - s.summary = 'Adapter for e2e tests.' + s.summary = 'Adapter for integration tests.' s.description = <<-DESC Runs tests that use the flutter_test API as integration tests. DESC - s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/e2e' + s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/integration_test' s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } - s.source = { :http => 'https://github.com/flutter/plugins/tree/master/packages/e2e' } + s.source = { :http => 'https://github.com/flutter/plugins/tree/master/packages/integration_test' } s.source_files = 'Classes/**/*' s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' diff --git a/packages/e2e/lib/_extension_io.dart b/packages/integration_test/lib/_extension_io.dart similarity index 100% rename from packages/e2e/lib/_extension_io.dart rename to packages/integration_test/lib/_extension_io.dart diff --git a/packages/e2e/lib/_extension_web.dart b/packages/integration_test/lib/_extension_web.dart similarity index 100% rename from packages/e2e/lib/_extension_web.dart rename to packages/integration_test/lib/_extension_web.dart diff --git a/packages/e2e/lib/common.dart b/packages/integration_test/lib/common.dart similarity index 97% rename from packages/e2e/lib/common.dart rename to packages/integration_test/lib/common.dart index 4325b6555ba8..3363e3c91989 100644 --- a/packages/e2e/lib/common.dart +++ b/packages/integration_test/lib/common.dart @@ -4,7 +4,7 @@ import 'dart:convert'; -/// An object sent from e2e back to the Flutter Driver in response to +/// An object sent from integration_test back to the Flutter Driver in response to /// `request_data` command. class Response { final List _failureDetails; diff --git a/packages/e2e/lib/e2e.dart b/packages/integration_test/lib/integration_test.dart similarity index 90% rename from packages/e2e/lib/e2e.dart rename to packages/integration_test/lib/integration_test.dart index 93ce1f2c6cac..e7261b4065c5 100644 --- a/packages/e2e/lib/e2e.dart +++ b/packages/integration_test/lib/integration_test.dart @@ -15,16 +15,16 @@ import '_extension_io.dart' if (dart.library.html) '_extension_web.dart'; /// A subclass of [LiveTestWidgetsFlutterBinding] that reports tests results /// on a channel to adapt them to native instrumentation test format. -class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { +class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { /// Sets up a listener to report that the tests are finished when everything is /// torn down. - E2EWidgetsFlutterBinding() { + IntegrationTestWidgetsFlutterBinding() { // TODO(jackson): Report test results as they arrive tearDownAll(() async { try { // For web integration tests we are not using the - // `plugins.flutter.io/e2e`. Mark the tests as complete before invoking - // the channel. + // `plugins.flutter.io/integration_test`. Mark the tests as complete + // before invoking the channel. if (kIsWeb) { if (!_allTestsPassed.isCompleted) { _allTestsPassed.complete(true); @@ -35,7 +35,7 @@ class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { {'results': results}, ); } on MissingPluginException { - print('Warning: E2E test plugin was not detected.'); + print('Warning: integration_test test plugin was not detected.'); } if (!_allTestsPassed.isCompleted) _allTestsPassed.complete(true); }); @@ -101,17 +101,17 @@ class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { /// Similar to [WidgetsFlutterBinding.ensureInitialized]. /// - /// Returns an instance of the [E2EWidgetsFlutterBinding], creating and + /// Returns an instance of the [IntegrationTestWidgetsFlutterBinding], creating and /// initializing it if necessary. static WidgetsBinding ensureInitialized() { if (WidgetsBinding.instance == null) { - E2EWidgetsFlutterBinding(); + IntegrationTestWidgetsFlutterBinding(); } - assert(WidgetsBinding.instance is E2EWidgetsFlutterBinding); + assert(WidgetsBinding.instance is IntegrationTestWidgetsFlutterBinding); return WidgetsBinding.instance; } - static const MethodChannel _channel = MethodChannel('plugins.flutter.io/e2e'); + static const MethodChannel _channel = MethodChannel('plugins.flutter.io/integrat_test'); /// Test results that will be populated after the tests have completed. /// diff --git a/packages/e2e/lib/e2e_driver.dart b/packages/integration_test/lib/integration_test_driver.dart similarity index 76% rename from packages/e2e/lib/e2e_driver.dart rename to packages/integration_test/lib/integration_test_driver.dart index c33083e07574..dc22cae8b292 100644 --- a/packages/e2e/lib/e2e_driver.dart +++ b/packages/integration_test/lib/integration_test_driver.dart @@ -8,11 +8,11 @@ import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; -import 'package:e2e/common.dart' as e2e; +import 'package:integration_test/common.dart'; import 'package:path/path.dart' as path; /// This method remains for backword compatibility. -Future main() => e2eDriver(); +Future integration_main() => integrationDriver(); /// Flutter Driver test output directory. /// @@ -22,16 +22,16 @@ Future main() => e2eDriver(); String testOutputsDirectory = Platform.environment['FLUTTER_TEST_OUTPUTS_DIR'] ?? 'build'; -/// The callback type to handle [e2e.Response.data] after the test succcess. +/// The callback type to handle [integration_test.Response.data] after the test succcess. typedef ResponseDataCallback = FutureOr Function(Map); /// Writes a json-serializable json data to to /// [testOutputsDirectory]/`testOutputFilename.json`. /// -/// This is the default `responseDataCallback` in [e2eDriver]. +/// This is the default `responseDataCallback` in [integrationDriver]. Future writeResponseData( Map data, { - String testOutputFilename = 'e2e_response_data', + String testOutputFilename = 'integration_response_data', String destinationDirectory, }) async { assert(testOutputFilename != null); @@ -45,33 +45,33 @@ Future writeResponseData( await file.writeAsString(resultString); } -/// Adaptor to run E2E test using `flutter drive`. +/// Adaptor to run an integration test using `flutter drive`. /// /// `timeout` controls the longest time waited before the test ends. /// It is not necessarily the execution time for the test app: the test may /// finish sooner than the `timeout`. /// -/// `responseDataCallback` is the handler for processing [e2e.Response.data]. +/// `responseDataCallback` is the handler for processing [integration_test.Response.data]. /// The default value is `writeResponseData`. /// -/// To an E2E test `.dart` using `flutter drive`, put a file named +/// To an integration test `.dart` using `flutter drive`, put a file named /// `_test.dart` in the app's `test_driver` directory: /// /// ```dart /// import 'dart:async'; /// -/// import 'package:e2e/e2e_driver.dart' as e2e; +/// import 'package:integration_test/integration_test_driver.dart'; /// -/// Future main() async => e2e.e2eDriver(); +/// Future main() async => integrationDriver(); /// /// ``` -Future e2eDriver({ +Future integrationDriver({ Duration timeout = const Duration(minutes: 1), ResponseDataCallback responseDataCallback = writeResponseData, }) async { final FlutterDriver driver = await FlutterDriver.connect(); final String jsonResult = await driver.requestData(null, timeout: timeout); - final e2e.Response response = e2e.Response.fromJson(jsonResult); + final Response response = Response.fromJson(jsonResult); await driver.close(); if (response.allTestsPassed) { diff --git a/packages/e2e/lib/e2e_perf.dart b/packages/integration_test/lib/integration_test_perf.dart similarity index 97% rename from packages/e2e/lib/e2e_perf.dart rename to packages/integration_test/lib/integration_test_perf.dart index 1b2ddd74c336..c0c6b6674292 100644 --- a/packages/e2e/lib/e2e_perf.dart +++ b/packages/integration_test/lib/integration_test_perf.dart @@ -9,7 +9,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/widgets.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; /// The maximum amount of time considered safe to spend for a frame's build /// phase. Anything past that is in the danger of missing the frame as 60FPS. @@ -38,9 +38,10 @@ const String kDebugWarning = ''' └─────────────────────────────────────────────────╌┄┈ 🐢 '''; -/// watches the [FrameTiming] of `action` and report it to the e2e binding. +/// Watches the [FrameTiming] of `action` and report it to the integration test +/// binding. Future watchPerformance( - E2EWidgetsFlutterBinding binding, + IntegrationTestWidgetsFlutterBinding binding, Future action(), { String reportKey = 'performance', }) async { diff --git a/packages/e2e/pubspec.yaml b/packages/integration_test/pubspec.yaml similarity index 71% rename from packages/e2e/pubspec.yaml rename to packages/integration_test/pubspec.yaml index e4e476d146d3..2494e7fcfe8c 100644 --- a/packages/e2e/pubspec.yaml +++ b/packages/integration_test/pubspec.yaml @@ -1,7 +1,7 @@ -name: e2e +name: integration_test description: Runs tests that use the flutter_test API as integration tests. version: 0.6.3 -homepage: https://github.com/flutter/plugins/tree/master/packages/e2e +homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test environment: sdk: ">=2.2.2 <3.0.0" @@ -23,7 +23,7 @@ flutter: plugin: platforms: android: - package: dev.flutter.plugins.e2e - pluginClass: E2EPlugin + package: dev.flutter.plugins.integrationTest + pluginClass: IntegrationTestPlugin ios: - pluginClass: E2EPlugin + pluginClass: IntegrationTestPlugin diff --git a/packages/e2e/test/binding_fail_test.dart b/packages/integration_test/test/binding_fail_test.dart similarity index 74% rename from packages/e2e/test/binding_fail_test.dart rename to packages/integration_test/test/binding_fail_test.dart index 0b00e1177e55..8b90b32f6bae 100644 --- a/packages/e2e/test/binding_fail_test.dart +++ b/packages/integration_test/test/binding_fail_test.dart @@ -6,10 +6,10 @@ import 'package:flutter_test/flutter_test.dart'; // Assumes that the flutter command is in `$PATH`. const String _flutterBin = 'flutter'; -const String _e2eResultsPrefix = 'E2EWidgetsFlutterBinding test results:'; +const String _integrationResultsPrefix = 'IntegrationTestWidgetsFlutterBinding test results:'; void main() async { - group('E2E binding result', () { + group('Integration binding result', () { test('when multiple tests pass', () async { final Map results = await _runTest('test/data/pass_test_script.dart'); @@ -48,18 +48,18 @@ void main() async { }); } -/// Runs a test script and returns the [E2EWidgetsFlutterBinding.result]. +/// Runs a test script and returns the [IntegrationTestWidgetsFlutterBinding.result]. /// /// [scriptPath] is relative to the package root. Future> _runTest(String scriptPath) async { final Process process = await Process.start(_flutterBin, ['test', '--machine', scriptPath]); - // In the test [tearDownAll] block, the test results are encoded into JSON and - // are printed with the [_e2eResultsPrefix] prefix. - // - // See the following for the test event spec which we parse the printed lines - // out of: https://github.com/dart-lang/test/blob/master/pkgs/test/doc/json_reporter.md + /// In the test [tearDownAll] block, the test results are encoded into JSON and + /// are printed with the [_integrationResultsPrefix] prefix. + /// + /// See the following for the test event spec which we parse the printed lines + /// out of: https://github.com/dart-lang/test/blob/master/pkgs/test/doc/json_reporter.md final String testResults = (await process.stdout .transform(utf8.decoder) .expand((String text) => text.split('\n')) @@ -74,8 +74,8 @@ Future> _runTest(String scriptPath) async { testEvent != null && testEvent['type'] == 'print') .map((dynamic printEvent) => printEvent['message'] as String) .firstWhere( - (String message) => message.startsWith(_e2eResultsPrefix))) - .replaceAll(_e2eResultsPrefix, ''); + (String message) => message.startsWith(_integrationResultsPrefix))) + .replaceAll(_integrationResultsPrefix, ''); return jsonDecode(testResults); } diff --git a/packages/e2e/test/binding_test.dart b/packages/integration_test/test/binding_test.dart similarity index 70% rename from packages/e2e/test/binding_test.dart rename to packages/integration_test/test/binding_test.dart index 50ff42dba39c..50cb0c6c3633 100644 --- a/packages/e2e/test/binding_test.dart +++ b/packages/integration_test/test/binding_test.dart @@ -1,30 +1,30 @@ import 'package:flutter/material.dart'; -import 'package:e2e/e2e.dart'; -import 'package:e2e/common.dart'; +import 'package:integration_test/integration_test.dart'; +import 'package:integration_test/common.dart'; import 'package:flutter_test/flutter_test.dart'; void main() async { Future> request; - group('Test E2E binding', () { - final WidgetsBinding binding = E2EWidgetsFlutterBinding.ensureInitialized(); - assert(binding is E2EWidgetsFlutterBinding); - final E2EWidgetsFlutterBinding e2eBinding = - binding as E2EWidgetsFlutterBinding; + group('Test Integration binding', () { + final WidgetsBinding binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + assert(binding is IntegrationTestWidgetsFlutterBinding); + final IntegrationTestWidgetsFlutterBinding integrationBinding = + binding as IntegrationTestWidgetsFlutterBinding; setUp(() { - request = e2eBinding.callback({ + request = integrationBinding.callback({ 'command': 'request_data', }); }); - testWidgets('Run E2E app', (WidgetTester tester) async { + testWidgets('Run Integration app', (WidgetTester tester) async { runApp(MaterialApp( home: Text('Test'), )); - expect(tester.binding, e2eBinding); - e2eBinding.reportData = {'answer': 42}; + expect(tester.binding, integrationBinding); + integrationBinding.reportData = {'answer': 42}; }); testWidgets('setSurfaceSize works', (WidgetTester tester) async { @@ -57,7 +57,7 @@ void main() async { tearDownAll(() async { // This part is outside the group so that `request` has been compeleted as // part of the `tearDownAll` registerred in the group during - // `E2EWidgetsFlutterBinding` initialization. + // `IntegrationTestWidgetsFlutterBinding` initialization. final Map response = (await request)['response'] as Map; final String message = response['message'] as String; diff --git a/packages/e2e/test/data/README.md b/packages/integration_test/test/data/README.md similarity index 100% rename from packages/e2e/test/data/README.md rename to packages/integration_test/test/data/README.md diff --git a/packages/e2e/test/data/fail_test_script.dart b/packages/integration_test/test/data/fail_test_script.dart similarity index 54% rename from packages/e2e/test/data/fail_test_script.dart rename to packages/integration_test/test/data/fail_test_script.dart index cbca5900fe29..05a75d7d031e 100644 --- a/packages/e2e/test/data/fail_test_script.dart +++ b/packages/integration_test/test/data/fail_test_script.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; void main() async { - final E2EWidgetsFlutterBinding binding = - E2EWidgetsFlutterBinding.ensureInitialized(); + final IntegrationTestWidgetsFlutterBinding binding = + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('failing test 1', (WidgetTester tester) async { expect(true, false); @@ -17,6 +17,6 @@ void main() async { tearDownAll(() { print( - 'E2EWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); + 'IntegrationTestWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); }); } diff --git a/packages/e2e/test/data/pass_test_script.dart b/packages/integration_test/test/data/pass_test_script.dart similarity index 54% rename from packages/e2e/test/data/pass_test_script.dart rename to packages/integration_test/test/data/pass_test_script.dart index 194f71cdfe9b..7e222c8e8961 100644 --- a/packages/e2e/test/data/pass_test_script.dart +++ b/packages/integration_test/test/data/pass_test_script.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; void main() async { - final E2EWidgetsFlutterBinding binding = - E2EWidgetsFlutterBinding.ensureInitialized(); + final IntegrationTestWidgetsFlutterBinding binding = + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('passing test 1', (WidgetTester tester) async { expect(true, true); @@ -17,6 +17,6 @@ void main() async { tearDownAll(() { print( - 'E2EWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); + 'IntegrationTestWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); }); } diff --git a/packages/e2e/test/data/pass_then_fail_test_script.dart b/packages/integration_test/test/data/pass_then_fail_test_script.dart similarity index 53% rename from packages/e2e/test/data/pass_then_fail_test_script.dart rename to packages/integration_test/test/data/pass_then_fail_test_script.dart index ffb7cac5cd5d..324c1c21cfa6 100644 --- a/packages/e2e/test/data/pass_then_fail_test_script.dart +++ b/packages/integration_test/test/data/pass_then_fail_test_script.dart @@ -1,11 +1,11 @@ import 'dart:convert'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; void main() async { - final E2EWidgetsFlutterBinding binding = - E2EWidgetsFlutterBinding.ensureInitialized(); + final IntegrationTestWidgetsFlutterBinding binding = + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('passing test', (WidgetTester tester) async { expect(true, true); @@ -17,6 +17,6 @@ void main() async { tearDownAll(() { print( - 'E2EWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); + 'IntegrationTestWidgetsFlutterBinding test results: ${jsonEncode(binding.results)}'); }); } diff --git a/packages/e2e/test/frame_timing_summarizer_test.dart b/packages/integration_test/test/frame_timing_summarizer_test.dart similarity index 95% rename from packages/e2e/test/frame_timing_summarizer_test.dart rename to packages/integration_test/test/frame_timing_summarizer_test.dart index f3a12850122d..1ebe33d94ef6 100644 --- a/packages/e2e/test/frame_timing_summarizer_test.dart +++ b/packages/integration_test/test/frame_timing_summarizer_test.dart @@ -2,7 +2,7 @@ import 'dart:ui'; import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e_perf.dart'; +import 'package:integration_test/integration_perf.dart'; void main() { test('Test FrameTimingSummarizer', () { diff --git a/packages/e2e/test/response_serialization_test.dart b/packages/integration_test/test/response_serialization_test.dart similarity index 97% rename from packages/e2e/test/response_serialization_test.dart rename to packages/integration_test/test/response_serialization_test.dart index 4d823e2ebf10..8b969402035d 100644 --- a/packages/e2e/test/response_serialization_test.dart +++ b/packages/integration_test/test/response_serialization_test.dart @@ -1,6 +1,6 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/common.dart'; +import 'package:integration_test/common.dart'; void main() { test('Serialize and deserialize Failure', () { diff --git a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java index 354f86b10ac6..63fae64bae4c 100644 --- a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java +++ b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauth; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.plugins.localauthexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java index 222316395505..37c97eef799a 100644 --- a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java +++ b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauth; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterFragmentActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index 166a043e9b66..9a53b6f8514f 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauthexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterFragmentActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; import io.flutter.plugins.localauth.LocalAuthPlugin; @@ -10,7 +10,7 @@ public class EmbeddingV1Activity extends FlutterFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/local_auth/example/pubspec.yaml b/packages/local_auth/example/pubspec.yaml index 478b37409f3e..8d17a43efb26 100644 --- a/packages/local_auth/example/pubspec.yaml +++ b/packages/local_auth/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 diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml index 3546cb9de3d9..ff4f64e61055 100644 --- a/packages/local_auth/pubspec.yaml +++ b/packages/local_auth/pubspec.yaml @@ -22,8 +22,8 @@ dependencies: flutter_plugin_android_lifecycle: ^1.0.2 dev_dependencies: - e2e: - path: ../e2e + integration_test: + path: ../integration_test flutter_driver: sdk: flutter flutter_test: diff --git a/packages/local_auth/test/local_auth_e2e.dart b/packages/local_auth/test/local_auth_e2e.dart index 5e9dc57b73f6..47e5dfa67912 100644 --- a/packages/local_auth/test/local_auth_e2e.dart +++ b/packages/local_auth/test/local_auth_e2e.dart @@ -1,10 +1,10 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:local_auth/local_auth.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('canCheckBiometrics', (WidgetTester tester) async { expect(LocalAuthentication().getAvailableBiometrics(), completion(isList)); diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java index 2da6799c19c4..810e514e6ec1 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java index 363ccecd5ebd..1c606b801fed 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/package_info/example/pubspec.yaml b/packages/package_info/example/pubspec.yaml index 8b4bd88c9acf..a6dbbce44811 100644 --- a/packages/package_info/example/pubspec.yaml +++ b/packages/package_info/example/pubspec.yaml @@ -6,8 +6,8 @@ dependencies: sdk: flutter package_info: path: ../ - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test dev_dependencies: flutter_driver: diff --git a/packages/package_info/example/test_driver/package_info_e2e.dart b/packages/package_info/example/test_driver/package_info_e2e.dart index d701c8030bd9..5038509ec84f 100644 --- a/packages/package_info/example/test_driver/package_info_e2e.dart +++ b/packages/package_info/example/test_driver/package_info_e2e.dart @@ -4,12 +4,12 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:package_info/package_info.dart'; import 'package:package_info_example/main.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('fromPlatform', (WidgetTester tester) async { final PackageInfo info = await PackageInfo.fromPlatform(); diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 0634da129370..3e54829c3f33 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -28,8 +28,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../e2e + integration_test: + path: ../integration_test pedantic: ^1.8.0 environment: diff --git a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java index 00ebeffe038a..c7beac3b34fd 100644 --- a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java +++ b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java index 59725c7123a5..28cc32e9279b 100644 --- a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java +++ b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index 2a59361e7f67..c634329f1275 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathproviderexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.pathprovider.PathProviderPlugin; @@ -10,7 +10,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); } diff --git a/packages/path_provider/path_provider/example/pubspec.yaml b/packages/path_provider/path_provider/example/pubspec.yaml index 367c6c68df45..983b3b82eb53 100644 --- a/packages/path_provider/path_provider/example/pubspec.yaml +++ b/packages/path_provider/path_provider/example/pubspec.yaml @@ -8,8 +8,8 @@ dependencies: path: ../ dev_dependencies: - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter test: any diff --git a/packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart b/packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart index d3a1019a7c23..8eb8520b5b4b 100644 --- a/packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart +++ b/packages/path_provider/path_provider/example/test_driver/path_provider_e2e.dart @@ -7,10 +7,10 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('getTemporaryDirectory', (WidgetTester tester) async { final Directory result = await getTemporaryDirectory(); diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml index cac4ff2656f4..d8d5ba33a20a 100644 --- a/packages/path_provider/path_provider/pubspec.yaml +++ b/packages/path_provider/path_provider/pubspec.yaml @@ -25,8 +25,8 @@ dependencies: path_provider_linux: ^0.0.1 dev_dependencies: - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test flutter_test: sdk: flutter flutter_driver: diff --git a/packages/path_provider/path_provider/test/path_provider_e2e.dart b/packages/path_provider/path_provider/test/path_provider_e2e.dart index 545671e32b01..18570aeca57e 100644 --- a/packages/path_provider/path_provider/test/path_provider_e2e.dart +++ b/packages/path_provider/path_provider/test/path_provider_e2e.dart @@ -1,9 +1,9 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can get temporary directory', (WidgetTester tester) async { final String tempPath = (await getTemporaryDirectory()).path; diff --git a/packages/path_provider/path_provider_linux/example/pubspec.yaml b/packages/path_provider/path_provider_linux/example/pubspec.yaml index 186142d1d3a7..85dbb24bbb29 100644 --- a/packages/path_provider/path_provider_linux/example/pubspec.yaml +++ b/packages/path_provider/path_provider_linux/example/pubspec.yaml @@ -24,8 +24,8 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/path_provider/path_provider_linux/example/test_driver/path_provider_e2e.dart b/packages/path_provider/path_provider_linux/example/test_driver/path_provider_e2e.dart index c90c4d96dde5..18ac49debbd4 100644 --- a/packages/path_provider/path_provider_linux/example/test_driver/path_provider_e2e.dart +++ b/packages/path_provider/path_provider_linux/example/test_driver/path_provider_e2e.dart @@ -5,10 +5,10 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('getTemporaryDirectory', (WidgetTester tester) async { final Directory result = await getTemporaryDirectory(); diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java index 00ebeffe038a..c7beac3b34fd 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java index 9f8e2c272a9a..9c0965f6911a 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.MainActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java index 36372960fe9c..6574cede8e47 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java @@ -4,7 +4,7 @@ package io.flutter.plugins.pathproviderexample; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.pathprovider.PathProviderPlugin; @@ -14,6 +14,6 @@ public class MainActivity extends FlutterActivity { @Override public void configureFlutterEngine(FlutterEngine flutterEngine) { flutterEngine.getPlugins().add(new PathProviderPlugin()); - flutterEngine.getPlugins().add(new E2EPlugin()); + flutterEngine.getPlugins().add(new IntegrationTestPlugin()); } } diff --git a/packages/path_provider/path_provider_macos/example/pubspec.yaml b/packages/path_provider/path_provider_macos/example/pubspec.yaml index e80768763e8b..1ba991dc8160 100644 --- a/packages/path_provider/path_provider_macos/example/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/example/pubspec.yaml @@ -9,8 +9,8 @@ dependencies: path: ../ dev_dependencies: - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter test: any diff --git a/packages/path_provider/path_provider_macos/example/test_driver/path_provider_e2e.dart b/packages/path_provider/path_provider_macos/example/test_driver/path_provider_e2e.dart index 6cb8362b76d5..58a4d1805cb0 100644 --- a/packages/path_provider/path_provider_macos/example/test_driver/path_provider_e2e.dart +++ b/packages/path_provider/path_provider_macos/example/test_driver/path_provider_e2e.dart @@ -5,10 +5,10 @@ import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('getTemporaryDirectory', (WidgetTester tester) async { final Directory result = await getTemporaryDirectory(); diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java index 8a3d6bee2354..6d7bd56a8c6f 100644 --- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java +++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.quickactionsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java index 84b0c3e6ea42..1eba7115cc42 100644 --- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java +++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.quickactionsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/quick_actions/example/pubspec.yaml b/packages/quick_actions/example/pubspec.yaml index 38427fcdadf0..6f9c0efd01af 100644 --- a/packages/quick_actions/example/pubspec.yaml +++ b/packages/quick_actions/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: diff --git a/packages/quick_actions/example/test_driver/quick_actions_e2e.dart b/packages/quick_actions/example/test_driver/quick_actions_e2e.dart index 41d35b874640..03ecfe491d93 100644 --- a/packages/quick_actions/example/test_driver/quick_actions_e2e.dart +++ b/packages/quick_actions/example/test_driver/quick_actions_e2e.dart @@ -3,11 +3,11 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:quick_actions/quick_actions.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can set shortcuts', (WidgetTester tester) async { final QuickActions quickActions = QuickActions(); diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml index be720f65be6c..a5ed4f79f029 100644 --- a/packages/quick_actions/pubspec.yaml +++ b/packages/quick_actions/pubspec.yaml @@ -23,8 +23,8 @@ dev_dependencies: mockito: ^3.0.0 flutter_test: sdk: flutter - e2e: - path: ../e2e + integration_test: + path: ../integration_test pedantic: ^1.8.0 environment: diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 80f6c8223377..5421a6a8f401 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sensorsexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sensors.SensorsPlugin; @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SensorsPlugin.registerWith(registrarFor("io.flutter.plugins.sensors.SensorsPlugin")); } } diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java index 92f0564ecc9e..99d12ea2299d 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.sensorsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java index c5d0c9392934..96a40538d317 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sensorsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/sensors/example/pubspec.yaml b/packages/sensors/example/pubspec.yaml index 02bca30f8f0b..eb46c611a43a 100644 --- a/packages/sensors/example/pubspec.yaml +++ b/packages/sensors/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: diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml index 9abbe6ba5d18..0970357a2bc2 100644 --- a/packages/sensors/pubspec.yaml +++ b/packages/sensors/pubspec.yaml @@ -24,8 +24,8 @@ dev_dependencies: test: ^1.3.0 flutter_test: sdk: flutter - e2e: - path: ../e2e + integration_test: + path: ../integration_test mockito: ^4.1.1 pedantic: ^1.8.0 diff --git a/packages/sensors/test/sensors_e2e.dart b/packages/sensors/test/sensors_e2e.dart index acc356dfc235..ea1db0375f38 100644 --- a/packages/sensors/test/sensors_e2e.dart +++ b/packages/sensors/test/sensors_e2e.dart @@ -5,10 +5,10 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:sensors/sensors.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can subscript to accelerometerEvents and get non-null events', (WidgetTester tester) async { diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index e12d223b0f7b..0e4b8f185653 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.shareexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.share.SharePlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharePlugin.registerWith(registrarFor("io.flutter.plugins.share.SharePlugin")); } } diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java index 83e7cf020174..0ced69d7d346 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.shareexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java index 0ad24ddc4824..18f291f71b8f 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.shareexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/share/example/pubspec.yaml b/packages/share/example/pubspec.yaml index 4c0bb731c8a9..4830b7186019 100644 --- a/packages/share/example/pubspec.yaml +++ b/packages/share/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: diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml index 8da4d85bf842..d81bf53258be 100644 --- a/packages/share/pubspec.yaml +++ b/packages/share/pubspec.yaml @@ -26,8 +26,8 @@ dev_dependencies: mockito: ^3.0.0 flutter_test: sdk: flutter - e2e: - path: ../e2e + integration_test: + path: ../integration_test pedantic: ^1.8.0 environment: diff --git a/packages/share/test/share_e2e.dart b/packages/share/test/share_e2e.dart index eb990222b009..08a19ce2c27b 100644 --- a/packages/share/test/share_e2e.dart +++ b/packages/share/test/share_e2e.dart @@ -4,10 +4,10 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:share/share.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can launch share', (WidgetTester tester) async { expect(Share.share('message', subject: 'title'), completes); diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index 33f294231602..999884db6d9d 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sharedpreferencesexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); } diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java index 6917efbc69a6..63ca86a0cced 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.sharedpreferencesexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java index 62a00b901081..7f11cf2a142c 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sharedpreferencesexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/shared_preferences/shared_preferences/example/pubspec.yaml b/packages/shared_preferences/shared_preferences/example/pubspec.yaml index 7a24c3f6f495..2b970949bee6 100644 --- a/packages/shared_preferences/shared_preferences/example/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/example/pubspec.yaml @@ -11,8 +11,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/shared_preferences/shared_preferences/example/test_driver/shared_preferences_e2e.dart b/packages/shared_preferences/shared_preferences/example/test_driver/shared_preferences_e2e.dart index b693df2131ed..0d49ed95dd2d 100644 --- a/packages/shared_preferences/shared_preferences/example/test_driver/shared_preferences_e2e.dart +++ b/packages/shared_preferences/shared_preferences/example/test_driver/shared_preferences_e2e.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('$SharedPreferences', () { const Map kTestValues = { diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml index 6477b33361ab..f78176a6159b 100644 --- a/packages/shared_preferences/shared_preferences/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/pubspec.yaml @@ -42,8 +42,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test pedantic: ^1.8.0 environment: diff --git a/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml index 6f0683776e05..5936e3ace02f 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_linux/example/pubspec.yaml @@ -18,8 +18,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/shared_preferences/shared_preferences_linux/example/test_driver/shared_preferences_e2e.dart b/packages/shared_preferences/shared_preferences_linux/example/test_driver/shared_preferences_e2e.dart index b693df2131ed..0d49ed95dd2d 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/test_driver/shared_preferences_e2e.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/test_driver/shared_preferences_e2e.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('$SharedPreferences', () { const Map kTestValues = { diff --git a/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml index c6f2026b59bb..de4b6ed9d379 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/example/pubspec.yaml @@ -12,8 +12,8 @@ dev_dependencies: flutter_driver: sdk: flutter test: any - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/shared_preferences/shared_preferences_macos/example/test_driver/shared_preferences_e2e.dart b/packages/shared_preferences/shared_preferences_macos/example/test_driver/shared_preferences_e2e.dart index b693df2131ed..0d49ed95dd2d 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/test_driver/shared_preferences_e2e.dart +++ b/packages/shared_preferences/shared_preferences_macos/example/test_driver/shared_preferences_e2e.dart @@ -1,10 +1,10 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('$SharedPreferences', () { const Map kTestValues = { diff --git a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java index 9ce8eb281f69..301178e8cd5e 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java index 927ff1dbac74..ff6fc8bd6b59 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index fc6aa5622573..217f0cfe2a51 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/url_launcher/url_launcher/example/pubspec.yaml b/packages/url_launcher/url_launcher/example/pubspec.yaml index 576b1041129b..b48445c3a7e9 100644 --- a/packages/url_launcher/url_launcher/example/pubspec.yaml +++ b/packages/url_launcher/url_launcher/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 diff --git a/packages/url_launcher/url_launcher/example/test_driver/url_launcher_e2e.dart b/packages/url_launcher/url_launcher/example/test_driver/url_launcher_e2e.dart index 6cf1168c81bd..fe51d94aa3a9 100644 --- a/packages/url_launcher/url_launcher/example/test_driver/url_launcher_e2e.dart +++ b/packages/url_launcher/url_launcher/example/test_driver/url_launcher_e2e.dart @@ -6,11 +6,11 @@ import 'dart:io' show Platform; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:url_launcher/url_launcher.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); test('canLaunch', () async { expect(await canLaunch('randomstring'), false); diff --git a/packages/url_launcher/url_launcher_linux/example/pubspec.yaml b/packages/url_launcher/url_launcher_linux/example/pubspec.yaml index 2d99a8c2df9c..c9d0c32f5cb6 100644 --- a/packages/url_launcher/url_launcher_linux/example/pubspec.yaml +++ b/packages/url_launcher/url_launcher_linux/example/pubspec.yaml @@ -9,8 +9,8 @@ dependencies: path: ../ dev_dependencies: - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter pedantic: ^1.8.0 diff --git a/packages/url_launcher/url_launcher_linux/example/test_driver/url_launcher_e2e.dart b/packages/url_launcher/url_launcher_linux/example/test_driver/url_launcher_e2e.dart index 516835cec33b..0b25516c2a29 100644 --- a/packages/url_launcher/url_launcher_linux/example/test_driver/url_launcher_e2e.dart +++ b/packages/url_launcher/url_launcher_linux/example/test_driver/url_launcher_e2e.dart @@ -3,11 +3,11 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:url_launcher/url_launcher.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); test('canLaunch', () async { expect(await canLaunch('randomstring'), false); diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java index 9ce8eb281f69..301178e8cd5e 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java index 927ff1dbac74..ff6fc8bd6b59 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index fc6aa5622573..217f0cfe2a51 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/url_launcher/url_launcher_macos/example/pubspec.yaml b/packages/url_launcher/url_launcher_macos/example/pubspec.yaml index a03bce7ad9f5..0fab67e8af1b 100644 --- a/packages/url_launcher/url_launcher_macos/example/pubspec.yaml +++ b/packages/url_launcher/url_launcher_macos/example/pubspec.yaml @@ -9,8 +9,8 @@ dependencies: path: ../ dev_dependencies: - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test flutter_driver: sdk: flutter pedantic: ^1.8.0 diff --git a/packages/url_launcher/url_launcher_macos/example/test_driver/url_launcher_e2e.dart b/packages/url_launcher/url_launcher_macos/example/test_driver/url_launcher_e2e.dart index e1d75f93b326..676b78c3bbfb 100644 --- a/packages/url_launcher/url_launcher_macos/example/test_driver/url_launcher_e2e.dart +++ b/packages/url_launcher/url_launcher_macos/example/test_driver/url_launcher_e2e.dart @@ -3,11 +3,11 @@ // BSD-style license that can be found in the LICENSE file. import 'package:flutter_test/flutter_test.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:url_launcher/url_launcher.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); test('canLaunch', () async { expect(await canLaunch('randomstring'), false); diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index de29b463fca9..0ed93b17c7bc 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.videoplayerexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.videoplayer.VideoPlayerPlugin; @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); VideoPlayerPlugin.registerWith( registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin")); } diff --git a/packages/video_player/video_player/example/pubspec.yaml b/packages/video_player/video_player/example/pubspec.yaml index 1fb4f5b8e089..e0afa4193dc2 100644 --- a/packages/video_player/video_player/example/pubspec.yaml +++ b/packages/video_player/video_player/example/pubspec.yaml @@ -12,8 +12,8 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - e2e: - path: ../../../e2e + integration_test: + path: ../../../integration_test test: any pedantic: ^1.8.0 diff --git a/packages/video_player/video_player/example/test_driver/video_player_e2e.dart b/packages/video_player/video_player/example/test_driver/video_player_e2e.dart index bf35cf50b728..0953c8feb6c0 100644 --- a/packages/video_player/video_player/example/test_driver/video_player_e2e.dart +++ b/packages/video_player/video_player/example/test_driver/video_player_e2e.dart @@ -3,14 +3,14 @@ // BSD-style license that can be found in the LICENSE file. import 'dart:io'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:video_player/video_player.dart'; const Duration _playDuration = Duration(seconds: 1); void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); VideoPlayerController _controller; tearDown(() async => _controller.dispose()); diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java index 80c7318e397e..587448b2e5be 100644 --- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java +++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.webviewflutterexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java index de7998186981..3198fd092c2e 100644 --- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java +++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.webviewflutterexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.e2e.FlutterTestRunner; +import dev.flutter.plugins.integrationTest.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index d0f538e89ce3..5b788edef65b 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.webviewflutterexample; import android.os.Bundle; -import dev.flutter.plugins.e2e.E2EPlugin; +import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin; @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - E2EPlugin.registerWith(registrarFor("dev.flutter.plugins.e2e.E2EPlugin")); + IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); WebViewFlutterPlugin.registerWith( registrarFor("io.flutter.plugins.webviewflutter.WebViewFlutterPlugin")); } diff --git a/packages/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/example/pubspec.yaml index f33076406f5f..44c740ae9739 100644 --- a/packages/webview_flutter/example/pubspec.yaml +++ b/packages/webview_flutter/example/pubspec.yaml @@ -15,8 +15,8 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - e2e: - path: ../../e2e + integration_test: + path: ../../integration_test pedantic: ^1.8.0 flutter: diff --git a/packages/webview_flutter/example/test_driver/webview_flutter_e2e.dart b/packages/webview_flutter/example/test_driver/webview_flutter_e2e.dart index 3468067de603..162ca2cdcd9a 100644 --- a/packages/webview_flutter/example/test_driver/webview_flutter_e2e.dart +++ b/packages/webview_flutter/example/test_driver/webview_flutter_e2e.dart @@ -13,10 +13,10 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:webview_flutter/platform_interface.dart'; import 'package:webview_flutter/webview_flutter.dart'; -import 'package:e2e/e2e.dart'; +import 'package:integration_test/integration_test.dart'; void main() { - E2EWidgetsFlutterBinding.ensureInitialized(); + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('initalUrl', (WidgetTester tester) async { final Completer controllerCompleter = From 85b18a17963ee12b629567fe8ec82a1ed555bbb8 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 10:58:36 -0700 Subject: [PATCH 02/20] version bumps --- packages/battery/pubspec.yaml | 2 +- packages/connectivity/connectivity/pubspec.yaml | 2 +- packages/connectivity/connectivity_for_web/pubspec.yaml | 2 +- packages/google_sign_in/google_sign_in/pubspec.yaml | 2 +- packages/image_picker/image_picker/pubspec.yaml | 2 +- packages/in_app_purchase/pubspec.yaml | 2 +- packages/local_auth/pubspec.yaml | 2 +- packages/package_info/pubspec.yaml | 2 +- packages/path_provider/path_provider/pubspec.yaml | 2 +- packages/quick_actions/pubspec.yaml | 2 +- packages/sensors/pubspec.yaml | 2 +- packages/share/pubspec.yaml | 2 +- packages/shared_preferences/shared_preferences/pubspec.yaml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/battery/pubspec.yaml b/packages/battery/pubspec.yaml index 22cfdf6a078c..7a02f37bab85 100644 --- 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.2 +version: 1.0.3 flutter: plugin: diff --git a/packages/connectivity/connectivity/pubspec.yaml b/packages/connectivity/connectivity/pubspec.yaml index bce5d5f831f9..dc9d90827169 100644 --- 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+1 +version: 0.4.9+2 flutter: plugin: diff --git a/packages/connectivity/connectivity_for_web/pubspec.yaml b/packages/connectivity/connectivity_for_web/pubspec.yaml index 1af35fda508b..adba1f4f9a47 100644 --- 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+1 +version: 0.3.1+2 homepage: https://github.com/ditman/plugins/tree/connectivity-web/packages/connectivity/experimental_connectivity_web flutter: diff --git a/packages/google_sign_in/google_sign_in/pubspec.yaml b/packages/google_sign_in/google_sign_in/pubspec.yaml index bc9ea71fed8c..c5bc15f037c5 100644 --- a/packages/google_sign_in/google_sign_in/pubspec.yaml +++ b/packages/google_sign_in/google_sign_in/pubspec.yaml @@ -2,7 +2,7 @@ name: google_sign_in description: Flutter plugin for Google Sign-In, a secure authentication system for signing in with a Google account on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in -version: 4.5.2 +version: 4.5.3 flutter: plugin: diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 1d752b8075ba..118faf3712bc 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker -version: 0.6.7+5 +version: 0.6.7+6 flutter: plugin: diff --git a/packages/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/pubspec.yaml index 31c4224ce2e5..0633d154cb8b 100644 --- a/packages/in_app_purchase/pubspec.yaml +++ b/packages/in_app_purchase/pubspec.yaml @@ -1,7 +1,7 @@ name: in_app_purchase description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play. homepage: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase -version: 0.3.4+3 +version: 0.3.4+4 dependencies: async: ^2.0.8 diff --git a/packages/local_auth/pubspec.yaml b/packages/local_auth/pubspec.yaml index ff4f64e61055..97b5d02faec4 100644 --- a/packages/local_auth/pubspec.yaml +++ b/packages/local_auth/pubspec.yaml @@ -2,7 +2,7 @@ name: local_auth description: Flutter plugin for Android and iOS device authentication sensors such as Fingerprint Reader and Touch ID. homepage: https://github.com/flutter/plugins/tree/master/packages/local_auth -version: 0.6.2+4 +version: 0.6.2+5 flutter: plugin: diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 3e54829c3f33..0705dd11d139 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/package_info # 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.2 +version: 0.4.3 flutter: plugin: diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml index d8d5ba33a20a..7781c76331d4 100644 --- a/packages/path_provider/path_provider/pubspec.yaml +++ b/packages/path_provider/path_provider/pubspec.yaml @@ -2,7 +2,7 @@ name: path_provider description: Flutter plugin for getting commonly used locations on the Android & iOS file systems, such as the temp and app data directories. homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider -version: 1.6.13 +version: 1.6.14 flutter: plugin: diff --git a/packages/quick_actions/pubspec.yaml b/packages/quick_actions/pubspec.yaml index a5ed4f79f029..0468bbfd2e00 100644 --- a/packages/quick_actions/pubspec.yaml +++ b/packages/quick_actions/pubspec.yaml @@ -2,7 +2,7 @@ name: quick_actions description: Flutter plugin for creating shortcuts on home screen, also known as Quick Actions on iOS and App Shortcuts on Android. homepage: https://github.com/flutter/plugins/tree/master/packages/quick_actions -version: 0.4.0+7 +version: 0.4.0+8 flutter: plugin: diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml index 0970357a2bc2..0daaf08521bc 100644 --- a/packages/sensors/pubspec.yaml +++ b/packages/sensors/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/sensors # 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.2+3 +version: 0.4.2+4 flutter: plugin: diff --git a/packages/share/pubspec.yaml b/packages/share/pubspec.yaml index d81bf53258be..f5e545ca112e 100644 --- a/packages/share/pubspec.yaml +++ b/packages/share/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/share # 0.6.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.6.4+4 +version: 0.6.4+5 flutter: plugin: diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml index f78176a6159b..04b7813a2a99 100644 --- a/packages/shared_preferences/shared_preferences/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/shared_prefere # 0.5.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.5.9 +version: 0.5.10 flutter: plugin: From f5174f8bc042203922d71842aaee0db1faaa17c0 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 14:58:58 -0700 Subject: [PATCH 03/20] merge --- packages/camera/CHANGELOG.md | 4 + .../plugins/camera/MethodCallHandlerImpl.java | 2 + packages/camera/pubspec.yaml | 2 +- packages/integration_test/CHANGELOG.md | 6 +- .../lib/integration_test_perf.dart | 200 ------------------ packages/integration_test/pubspec.yaml | 2 +- .../test/frame_timing_summarizer_test.dart | 35 --- 7 files changed, 13 insertions(+), 238 deletions(-) delete mode 100644 packages/integration_test/lib/integration_test_perf.dart delete mode 100644 packages/integration_test/test/frame_timing_summarizer_test.dart diff --git a/packages/camera/CHANGELOG.md b/packages/camera/CHANGELOG.md index 43e5f463604c..88c0ed8c7625 100644 --- a/packages/camera/CHANGELOG.md +++ b/packages/camera/CHANGELOG.md @@ -1,3 +1,7 @@ +## 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 diff --git a/packages/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java b/packages/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java index cb58d19a9a02..132075555f26 100644 --- a/packages/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java +++ b/packages/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java @@ -167,8 +167,10 @@ private void instantiateCamera(MethodCall call, Result result) throws CameraAcce private void handleException(Exception exception, Result result) { if (exception instanceof CameraAccessException) { result.error("CameraAccess", exception.getMessage(), null); + return; } + // CameraAccessException can not be cast to a RuntimeException. throw (RuntimeException) exception; } } diff --git a/packages/camera/pubspec.yaml b/packages/camera/pubspec.yaml index a1ce42370191..a93c016e1f10 100644 --- a/packages/camera/pubspec.yaml +++ b/packages/camera/pubspec.yaml @@ -2,7 +2,7 @@ name: camera description: A Flutter plugin for getting information about and controlling the camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video, and streaming image buffers to dart. -version: 0.5.8+3 +version: 0.5.8+4 homepage: https://github.com/flutter/plugins/tree/master/packages/camera diff --git a/packages/integration_test/CHANGELOG.md b/packages/integration_test/CHANGELOG.md index 990aa5536be1..cbd5282028f4 100644 --- a/packages/integration_test/CHANGELOG.md +++ b/packages/integration_test/CHANGELOG.md @@ -1,7 +1,11 @@ -## 0.7.0 +## 0.8.0 * Rename plugin to integration_test. +## 0.7.0 + +* Move utilities for tracking frame performance in an e2e test to `flutter_test`. + ## 0.6.3 * Add customizable `flutter_driver` adaptor. diff --git a/packages/integration_test/lib/integration_test_perf.dart b/packages/integration_test/lib/integration_test_perf.dart deleted file mode 100644 index c0c6b6674292..000000000000 --- a/packages/integration_test/lib/integration_test_perf.dart +++ /dev/null @@ -1,200 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; -import 'dart:ui'; - -import 'package:flutter/scheduler.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter/widgets.dart'; - -import 'package:integration_test/integration_test.dart'; - -/// The maximum amount of time considered safe to spend for a frame's build -/// phase. Anything past that is in the danger of missing the frame as 60FPS. -/// -/// Changing this doesn't re-evaluate existing summary. -Duration kBuildBudget = const Duration(milliseconds: 16); -// TODO(CareF): Automatically calculate the refresh budget (#61958) - -bool _firstRun = true; - -/// The warning message to show when a benchmark is performed with assert on. -/// TODO(CareF) remove this and update pubspect when flutter/flutter#61509 is -/// in released version. -const String kDebugWarning = ''' -┏╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍┓ -┇ ⚠ THIS BENCHMARK IS BEING RUN IN DEBUG MODE ⚠ ┇ -┡╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍╍┦ -│ │ -│ Numbers obtained from a benchmark while asserts are │ -│ enabled will not accurately reflect the performance │ -│ that will be experienced by end users using release ╎ -│ builds. Benchmarks should be run using this command ╎ -│ line: "flutter run --profile test.dart" or ┊ -│ or "flutter drive --profile -t test.dart". ┊ -│ ┊ -└─────────────────────────────────────────────────╌┄┈ 🐢 -'''; - -/// Watches the [FrameTiming] of `action` and report it to the integration test -/// binding. -Future watchPerformance( - IntegrationTestWidgetsFlutterBinding binding, - Future action(), { - String reportKey = 'performance', -}) async { - assert(() { - if (_firstRun) { - debugPrint(kDebugWarning); - _firstRun = false; - } - return true; - }()); - final List frameTimings = []; - final TimingsCallback watcher = frameTimings.addAll; - binding.addTimingsCallback(watcher); - await action(); - binding.removeTimingsCallback(watcher); - final FrameTimingSummarizer frameTimes = FrameTimingSummarizer(frameTimings); - binding.reportData = {reportKey: frameTimes.summary}; -} - -/// This class and summarizes a list of [FrameTiming] for the performance -/// metrics. -class FrameTimingSummarizer { - /// Summarize `data` to frame build time and frame rasterizer time statistics. - /// - /// See [TimelineSummary.summaryJson] for detail. - factory FrameTimingSummarizer(List data) { - assert(data != null); - assert(data.isNotEmpty); - final List frameBuildTime = List.unmodifiable( - data.map((FrameTiming datum) => datum.buildDuration), - ); - final List frameBuildTimeSorted = - List.from(frameBuildTime)..sort(); - final List frameRasterizerTime = List.unmodifiable( - data.map((FrameTiming datum) => datum.rasterDuration), - ); - final List frameRasterizerTimeSorted = - List.from(frameRasterizerTime)..sort(); - final Duration Function(Duration, Duration) add = - (Duration a, Duration b) => a + b; - return FrameTimingSummarizer._( - frameBuildTime: frameBuildTime, - frameRasterizerTime: frameRasterizerTime, - // This avarage calculation is microsecond precision, which is fine - // because typical values of these times are milliseconds. - averageFrameBuildTime: frameBuildTime.reduce(add) ~/ data.length, - p90FrameBuildTime: _findPercentile(frameBuildTimeSorted, 0.90), - p99FrameBuildTime: _findPercentile(frameBuildTimeSorted, 0.99), - worstFrameBuildTime: frameBuildTimeSorted.last, - missedFrameBuildBudget: _countExceed(frameBuildTimeSorted, kBuildBudget), - averageFrameRasterizerTime: - frameRasterizerTime.reduce(add) ~/ data.length, - p90FrameRasterizerTime: _findPercentile(frameRasterizerTimeSorted, 0.90), - p99FrameRasterizerTime: _findPercentile(frameRasterizerTimeSorted, 0.99), - worstFrameRasterizerTime: frameRasterizerTimeSorted.last, - missedFrameRasterizerBudget: - _countExceed(frameRasterizerTimeSorted, kBuildBudget), - ); - } - - const FrameTimingSummarizer._({ - @required this.frameBuildTime, - @required this.frameRasterizerTime, - @required this.averageFrameBuildTime, - @required this.p90FrameBuildTime, - @required this.p99FrameBuildTime, - @required this.worstFrameBuildTime, - @required this.missedFrameBuildBudget, - @required this.averageFrameRasterizerTime, - @required this.p90FrameRasterizerTime, - @required this.p99FrameRasterizerTime, - @required this.worstFrameRasterizerTime, - @required this.missedFrameRasterizerBudget, - }); - - /// List of frame build time in microseconds - final List frameBuildTime; - - /// List of frame rasterizer time in microseconds - final List frameRasterizerTime; - - /// The average value of [frameBuildTime] in milliseconds. - final Duration averageFrameBuildTime; - - /// The 90-th percentile value of [frameBuildTime] in milliseconds - final Duration p90FrameBuildTime; - - /// The 99-th percentile value of [frameBuildTime] in milliseconds - final Duration p99FrameBuildTime; - - /// The largest value of [frameBuildTime] in milliseconds - final Duration worstFrameBuildTime; - - /// Number of items in [frameBuildTime] that's greater than [kBuildBudget] - final int missedFrameBuildBudget; - - /// The average value of [frameRasterizerTime] in milliseconds. - final Duration averageFrameRasterizerTime; - - /// The 90-th percentile value of [frameRasterizerTime] in milliseconds. - final Duration p90FrameRasterizerTime; - - /// The 99-th percentile value of [frameRasterizerTime] in milliseconds. - final Duration p99FrameRasterizerTime; - - /// The largest value of [frameRasterizerTime] in milliseconds. - final Duration worstFrameRasterizerTime; - - /// Number of items in [frameRasterizerTime] that's greater than [kBuildBudget] - final int missedFrameRasterizerBudget; - - /// Convert the summary result to a json object. - /// - /// See [TimelineSummary.summaryJson] for detail. - Map get summary => { - 'average_frame_build_time_millis': - averageFrameBuildTime.inMicroseconds / 1E3, - '90th_percentile_frame_build_time_millis': - p90FrameBuildTime.inMicroseconds / 1E3, - '99th_percentile_frame_build_time_millis': - p99FrameBuildTime.inMicroseconds / 1E3, - 'worst_frame_build_time_millis': - worstFrameBuildTime.inMicroseconds / 1E3, - 'missed_frame_build_budget_count': missedFrameBuildBudget, - 'average_frame_rasterizer_time_millis': - averageFrameRasterizerTime.inMicroseconds / 1E3, - '90th_percentile_frame_rasterizer_time_millis': - p90FrameRasterizerTime.inMicroseconds / 1E3, - '99th_percentile_frame_rasterizer_time_millis': - p99FrameRasterizerTime.inMicroseconds / 1E3, - 'worst_frame_rasterizer_time_millis': - worstFrameRasterizerTime.inMicroseconds / 1E3, - 'missed_frame_rasterizer_budget_count': missedFrameRasterizerBudget, - 'frame_count': frameBuildTime.length, - 'frame_build_times': frameBuildTime - .map((Duration datum) => datum.inMicroseconds) - .toList(), - 'frame_rasterizer_times': frameRasterizerTime - .map((Duration datum) => datum.inMicroseconds) - .toList(), - }; -} - -// The following helper functions require data sorted - -// return the 100*p-th percentile of the data -T _findPercentile(List data, double p) { - assert(p >= 0 && p <= 1); - return data[((data.length - 1) * p).round()]; -} - -// return the number of items in data that > threshold -int _countExceed>(List data, T threshold) { - return data.length - - data.indexWhere((T datum) => datum.compareTo(threshold) > 0); -} diff --git a/packages/integration_test/pubspec.yaml b/packages/integration_test/pubspec.yaml index 2494e7fcfe8c..96849a2721e0 100644 --- a/packages/integration_test/pubspec.yaml +++ b/packages/integration_test/pubspec.yaml @@ -1,6 +1,6 @@ name: integration_test description: Runs tests that use the flutter_test API as integration tests. -version: 0.6.3 +version: 0.8.0 homepage: https://github.com/flutter/plugins/tree/master/packages/integration_test environment: diff --git a/packages/integration_test/test/frame_timing_summarizer_test.dart b/packages/integration_test/test/frame_timing_summarizer_test.dart deleted file mode 100644 index 1ebe33d94ef6..000000000000 --- a/packages/integration_test/test/frame_timing_summarizer_test.dart +++ /dev/null @@ -1,35 +0,0 @@ -import 'dart:ui'; - -import 'package:flutter_test/flutter_test.dart'; - -import 'package:integration_test/integration_perf.dart'; - -void main() { - test('Test FrameTimingSummarizer', () { - List buildTimes = [ - for (int i = 1; i <= 100; i += 1) 1000 * i, - ]; - buildTimes = buildTimes.reversed.toList(); - List rasterTimes = [ - for (int i = 1; i <= 100; i += 1) 1000 * i + 1000, - ]; - rasterTimes = rasterTimes.reversed.toList(); - List inputData = [ - for (int i = 0; i < 100; i += 1) - FrameTiming([0, buildTimes[i], 500, rasterTimes[i]]), - ]; - FrameTimingSummarizer summary = FrameTimingSummarizer(inputData); - expect(summary.averageFrameBuildTime.inMicroseconds, 50500); - expect(summary.p90FrameBuildTime.inMicroseconds, 90000); - expect(summary.p99FrameBuildTime.inMicroseconds, 99000); - expect(summary.worstFrameBuildTime.inMicroseconds, 100000); - expect(summary.missedFrameBuildBudget, 84); - - expect(summary.averageFrameRasterizerTime.inMicroseconds, 51000); - expect(summary.p90FrameRasterizerTime.inMicroseconds, 90500); - expect(summary.p99FrameRasterizerTime.inMicroseconds, 99500); - expect(summary.worstFrameRasterizerTime.inMicroseconds, 100500); - expect(summary.missedFrameRasterizerBudget, 85); - expect(summary.frameBuildTime.length, 100); - }); -} From 42703c266ba528452fe301aa91caf51854da7146 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 15:42:49 -0700 Subject: [PATCH 04/20] drop version for test --- packages/connectivity/connectivity_for_web/test/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/connectivity/connectivity_for_web/test/pubspec.yaml b/packages/connectivity/connectivity_for_web/test/pubspec.yaml index ef3a9298668e..512b7df8c26e 100644 --- a/packages/connectivity/connectivity_for_web/test/pubspec.yaml +++ b/packages/connectivity/connectivity_for_web/test/pubspec.yaml @@ -1,6 +1,5 @@ name: connectivity_web_example 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: From d60009c2603d91233b842c4631750f0bbcbd8bb7 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 22:49:03 -0700 Subject: [PATCH 05/20] format --- .../plugins/urllauncherexample/EmbeddingV1Activity.java | 3 ++- .../plugins/urllauncherexample/EmbeddingV1Activity.java | 3 ++- .../plugins/videoplayerexample/EmbeddingV1Activity.java | 3 ++- .../plugins/webviewflutterexample/EmbeddingV1Activity.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 217f0cfe2a51..d5509ff873d9 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -14,7 +14,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 217f0cfe2a51..d5509ff873d9 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -14,7 +14,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index 0ed93b17c7bc..9fe6e8249261 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -13,7 +13,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); VideoPlayerPlugin.registerWith( registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin")); } diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index 5b788edef65b..4d9239a3c7df 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -13,7 +13,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); WebViewFlutterPlugin.registerWith( registrarFor("io.flutter.plugins.webviewflutter.WebViewFlutterPlugin")); } From aef400edac40c53f683e9a4d5475ed0aa39f1ca5 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 22:50:39 -0700 Subject: [PATCH 06/20] fix podspec --- packages/integration_test/ios/integration_test.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/integration_test/ios/integration_test.podspec b/packages/integration_test/ios/integration_test.podspec index c38078b3da74..9fb0dfc9d790 100644 --- a/packages/integration_test/ios/integration_test.podspec +++ b/packages/integration_test/ios/integration_test.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'IntegrationTest' + s.name = 'integration_test' s.version = '0.0.1' s.summary = 'Adapter for integration tests.' s.description = <<-DESC From 4323a87bcfcbb86b3b65caf8ff993b0f9e622e20 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 11 Aug 2020 23:12:38 -0700 Subject: [PATCH 07/20] format or real --- .../batteryexample/EmbedderV1Activity.java | 3 ++- .../cameraexample/EmbeddingV1Activity.java | 3 ++- .../ios/Classes/FLTConnectivityPlugin.m | 4 ++- .../EmbeddingV1Activity.java | 3 ++- .../EmbeddingV1Activity.java | 3 ++- .../EmbeddingV1Activity.java | 3 ++- .../FlutterActivityWithPermissionTest.java | 4 +-- .../e2e_example/EmbedderV1Activity.java | 3 ++- .../example/ios/RunnerTests/RunnerTests.m | 2 +- .../test_driver/example_integration.dart | 4 +-- .../ios/Classes/IntegrationTestIosTest.h | 27 +++++++++---------- .../ios/Classes/IntegrationTestIosTest.m | 22 ++++++--------- .../ios/Classes/IntegrationTestPlugin.h | 3 +-- .../ios/Classes/IntegrationTestPlugin.m | 16 +++++------ .../lib/integration_test.dart | 6 +++-- .../test/binding_fail_test.dart | 7 ++--- .../integration_test/test/binding_test.dart | 3 ++- .../localauthexample/EmbeddingV1Activity.java | 3 ++- .../EmbeddingV1Activity.java | 3 ++- .../sensorsexample/EmbeddingV1Activity.java | 3 ++- .../shareexample/EmbeddingV1Activity.java | 3 ++- .../EmbeddingV1Activity.java | 3 ++- 22 files changed, 68 insertions(+), 63 deletions(-) diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 2e871681e657..25d8ec82b06e 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -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")); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); } } diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index ddac12d0db30..d336bd2126fb 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java @@ -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")); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); VideoPlayerPlugin.registerWith( diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m index 526bee25d561..0a65409b3828 100644 --- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m @@ -156,7 +156,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { return @"unknown"; } + default: { + return @"unknown"; + } } } diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index 1532affbf6a0..886d401be40a 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -9,7 +9,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index da27c735b3e3..54ab75c76eb3 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -10,6 +10,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); GoogleMapsPlugin.registerWith(registrarFor("io.flutter.plugins.googlemaps.GoogleMapsPlugin")); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); } } diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index 504c435b3d0a..cc91af5023da 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -14,7 +14,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); InAppPurchasePlugin.registerWith( diff --git a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java index 525d08ab65e6..2d2da6385062 100644 --- a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java @@ -9,8 +9,8 @@ import org.junit.runner.RunWith; /** - * Demonstrates how an integration test on Android can be run with permissions already granted. This is - * helpful if developers want to test native App behavior that depends on certain system service + * Demonstrates how an integration test on Android can be run with permissions already granted. This + * is helpful if developers want to test native App behavior that depends on certain system service * results which are guarded with permissions. */ @RunWith(FlutterTestRunner.class) diff --git a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java index 732a9bfb7a19..db69dabe7fd5 100644 --- a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java +++ b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java @@ -12,6 +12,7 @@ public class EmbedderV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); } } diff --git a/packages/integration_test/example/ios/RunnerTests/RunnerTests.m b/packages/integration_test/example/ios/RunnerTests/RunnerTests.m index a30374f9f8ea..ac89c60e5f06 100644 --- a/packages/integration_test/example/ios/RunnerTests/RunnerTests.m +++ b/packages/integration_test/example/ios/RunnerTests/RunnerTests.m @@ -1,4 +1,4 @@ -#import #import +#import INTEGRATION_TEST_IOS_RUNNER(RunnerTests) diff --git a/packages/integration_test/example/test_driver/example_integration.dart b/packages/integration_test/example/test_driver/example_integration.dart index c2aea5234ca6..3ee993b911b9 100644 --- a/packages/integration_test/example/test_driver/example_integration.dart +++ b/packages/integration_test/example/test_driver/example_integration.dart @@ -7,8 +7,8 @@ import 'package:integration_test/integration_test.dart'; -import 'example_integration_io.dart' if (dart.library.html) 'example_integration_web.dart' - as tests; +import 'example_integration_io.dart' + if (dart.library.html) 'example_integration_web.dart' as tests; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/integration_test/ios/Classes/IntegrationTestIosTest.h b/packages/integration_test/ios/Classes/IntegrationTestIosTest.h index bd17f634d702..9c53edb160e9 100644 --- a/packages/integration_test/ios/Classes/IntegrationTestIosTest.h +++ b/packages/integration_test/ios/Classes/IntegrationTestIosTest.h @@ -6,18 +6,17 @@ @end -#define INTEGRATION_TEST_IOS_RUNNER(__test_class) \ - @interface __test_class : XCTestCase \ - @end \ - \ - @implementation __test_class \ - \ - -(void)testIntegrationTest { \ - NSString *testResult; \ - IntegrationTestIosTest *integrationTestIosTest = \ - [[IntegrationTestIosTest alloc] init]; \ - BOOL testPass = [integrationTestIosTest testIntegrationTest:&testResult]; \ - XCTAssertTrue(testPass, @"%@", testResult); \ - } \ - \ +#define INTEGRATION_TEST_IOS_RUNNER(__test_class) \ + @interface __test_class : XCTestCase \ + @end \ + \ + @implementation __test_class \ + \ + -(void)testIntegrationTest { \ + NSString *testResult; \ + IntegrationTestIosTest *integrationTestIosTest = [[IntegrationTestIosTest alloc] init]; \ + BOOL testPass = [integrationTestIosTest testIntegrationTest:&testResult]; \ + XCTAssertTrue(testPass, @"%@", testResult); \ + } \ + \ @end diff --git a/packages/integration_test/ios/Classes/IntegrationTestIosTest.m b/packages/integration_test/ios/Classes/IntegrationTestIosTest.m index 2716e9585cfa..4243cdd86bc0 100644 --- a/packages/integration_test/ios/Classes/IntegrationTestIosTest.m +++ b/packages/integration_test/ios/Classes/IntegrationTestIosTest.m @@ -4,24 +4,19 @@ @implementation IntegrationTestIosTest - (BOOL)testIntegrationTest:(NSString **)testResult { - IntegrationTestPlugin *integrationTestPlugin = - [IntegrationTestPlugin instance]; + IntegrationTestPlugin *integrationTestPlugin = [IntegrationTestPlugin instance]; UIViewController *rootViewController = - [[[[UIApplication sharedApplication] delegate] window] - rootViewController]; + [[[[UIApplication sharedApplication] delegate] window] rootViewController]; if (![rootViewController isKindOfClass:[FlutterViewController class]]) { NSLog(@"expected FlutterViewController as rootViewController."); return NO; } - FlutterViewController *flutterViewController = - (FlutterViewController *)rootViewController; - [integrationTestPlugin - setupChannels:flutterViewController.engine.binaryMessenger]; + FlutterViewController *flutterViewController = (FlutterViewController *)rootViewController; + [integrationTestPlugin setupChannels:flutterViewController.engine.binaryMessenger]; while (!integrationTestPlugin.testResults) { CFRunLoopRunInMode(kCFRunLoopDefaultMode, 1.f, NO); } - NSDictionary *testResults = - integrationTestPlugin.testResults; + NSDictionary *testResults = integrationTestPlugin.testResults; NSMutableArray *passedTests = [NSMutableArray array]; NSMutableArray *failedTests = [NSMutableArray array]; NSLog(@"==================== Test Results ====================="); @@ -38,10 +33,9 @@ - (BOOL)testIntegrationTest:(NSString **)testResult { NSLog(@"================== Test Results End ===================="); BOOL testPass = failedTests.count == 0; if (!testPass && testResult) { - *testResult = [NSString - stringWithFormat:@"Detected failed integration test(s) %@ among %@", - failedTests.description, - testResults.allKeys.description]; + *testResult = + [NSString stringWithFormat:@"Detected failed integration test(s) %@ among %@", + failedTests.description, testResults.allKeys.description]; } return testPass; } diff --git a/packages/integration_test/ios/Classes/IntegrationTestPlugin.h b/packages/integration_test/ios/Classes/IntegrationTestPlugin.h index d4d8ee540990..8dd3109ffe09 100644 --- a/packages/integration_test/ios/Classes/IntegrationTestPlugin.h +++ b/packages/integration_test/ios/Classes/IntegrationTestPlugin.h @@ -11,8 +11,7 @@ NS_ASSUME_NONNULL_BEGIN * completion, it is * @c nil. */ -@property(nonatomic, readonly, nullable) - NSDictionary *testResults; +@property(nonatomic, readonly, nullable) NSDictionary *testResults; /** Fetches the singleton instance of the plugin. */ + (IntegrationTestPlugin *)instance; diff --git a/packages/integration_test/ios/Classes/IntegrationTestPlugin.m b/packages/integration_test/ios/Classes/IntegrationTestPlugin.m index 5c31d27633d5..99d0c7fdf888 100644 --- a/packages/integration_test/ios/Classes/IntegrationTestPlugin.m +++ b/packages/integration_test/ios/Classes/IntegrationTestPlugin.m @@ -1,13 +1,11 @@ #import "IntegrationTestPlugin.h" -static NSString *const kIntegrationTestPluginChannel = - @"plugins.flutter.io/integratoin_test"; +static NSString *const kIntegrationTestPluginChannel = @"plugins.flutter.io/integratoin_test"; static NSString *const kMethodTestFinished = @"allTestsFinished"; @interface IntegrationTestPlugin () -@property(nonatomic, readwrite) - NSDictionary *testResults; +@property(nonatomic, readwrite) NSDictionary *testResults; @end @@ -39,14 +37,12 @@ - (void)setupChannels:(id)binaryMessenger { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:kIntegrationTestPluginChannel binaryMessenger:binaryMessenger]; - [channel - setMethodCallHandler:^(FlutterMethodCall *call, FlutterResult result) { - [self handleMethodCall:call result:result]; - }]; + [channel setMethodCallHandler:^(FlutterMethodCall *call, FlutterResult result) { + [self handleMethodCall:call result:result]; + }]; } -- (void)handleMethodCall:(FlutterMethodCall *)call - result:(FlutterResult)result { +- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result { if ([kMethodTestFinished isEqual:call.method]) { self.testResults = call.arguments[@"results"]; result(nil); diff --git a/packages/integration_test/lib/integration_test.dart b/packages/integration_test/lib/integration_test.dart index e7261b4065c5..aa53a588f194 100644 --- a/packages/integration_test/lib/integration_test.dart +++ b/packages/integration_test/lib/integration_test.dart @@ -15,7 +15,8 @@ import '_extension_io.dart' if (dart.library.html) '_extension_web.dart'; /// A subclass of [LiveTestWidgetsFlutterBinding] that reports tests results /// on a channel to adapt them to native instrumentation test format. -class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { +class IntegrationTestWidgetsFlutterBinding + extends LiveTestWidgetsFlutterBinding { /// Sets up a listener to report that the tests are finished when everything is /// torn down. IntegrationTestWidgetsFlutterBinding() { @@ -111,7 +112,8 @@ class IntegrationTestWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding return WidgetsBinding.instance; } - static const MethodChannel _channel = MethodChannel('plugins.flutter.io/integrat_test'); + static const MethodChannel _channel = + MethodChannel('plugins.flutter.io/integrat_test'); /// Test results that will be populated after the tests have completed. /// diff --git a/packages/integration_test/test/binding_fail_test.dart b/packages/integration_test/test/binding_fail_test.dart index 8b90b32f6bae..020fb9607608 100644 --- a/packages/integration_test/test/binding_fail_test.dart +++ b/packages/integration_test/test/binding_fail_test.dart @@ -6,7 +6,8 @@ import 'package:flutter_test/flutter_test.dart'; // Assumes that the flutter command is in `$PATH`. const String _flutterBin = 'flutter'; -const String _integrationResultsPrefix = 'IntegrationTestWidgetsFlutterBinding test results:'; +const String _integrationResultsPrefix = + 'IntegrationTestWidgetsFlutterBinding test results:'; void main() async { group('Integration binding result', () { @@ -73,8 +74,8 @@ Future> _runTest(String scriptPath) async { .where((dynamic testEvent) => testEvent != null && testEvent['type'] == 'print') .map((dynamic printEvent) => printEvent['message'] as String) - .firstWhere( - (String message) => message.startsWith(_integrationResultsPrefix))) + .firstWhere((String message) => + message.startsWith(_integrationResultsPrefix))) .replaceAll(_integrationResultsPrefix, ''); return jsonDecode(testResults); diff --git a/packages/integration_test/test/binding_test.dart b/packages/integration_test/test/binding_test.dart index 50cb0c6c3633..bad365ac59b6 100644 --- a/packages/integration_test/test/binding_test.dart +++ b/packages/integration_test/test/binding_test.dart @@ -8,7 +8,8 @@ void main() async { Future> request; group('Test Integration binding', () { - final WidgetsBinding binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + final WidgetsBinding binding = + IntegrationTestWidgetsFlutterBinding.ensureInitialized(); assert(binding is IntegrationTestWidgetsFlutterBinding); final IntegrationTestWidgetsFlutterBinding integrationBinding = binding as IntegrationTestWidgetsFlutterBinding; diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index 9a53b6f8514f..ec9f5d3b044c 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -10,7 +10,8 @@ public class EmbeddingV1Activity extends FlutterFragmentActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index c634329f1275..3d52b9f2a351 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -10,7 +10,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); } diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 5421a6a8f401..6a6f65e4f5d3 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -13,7 +13,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SensorsPlugin.registerWith(registrarFor("io.flutter.plugins.sensors.SensorsPlugin")); } } diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index 0e4b8f185653..b903d6abd027 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -14,7 +14,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharePlugin.registerWith(registrarFor("io.flutter.plugins.share.SharePlugin")); } } diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index 999884db6d9d..2ec9a2765df3 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -14,7 +14,8 @@ public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - IntegrationTestPlugin.registerWith(registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + IntegrationTestPlugin.registerWith( + registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); } From 7d1a7b8892f120b3e2c8cf27cb7c52b4166b9f6e Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 12 Aug 2020 11:28:00 -0700 Subject: [PATCH 08/20] clang differences --- .../connectivity/ios/Classes/FLTConnectivityPlugin.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m index 0a65409b3828..526bee25d561 100644 --- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m @@ -156,9 +156,7 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { - return @"unknown"; - } + default: { return @"unknown"; } } } From 3e545715014f06d1852122b284ed89a908cc02ef Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 12 Aug 2020 15:08:00 -0700 Subject: [PATCH 09/20] changelogs --- packages/battery/CHANGELOG.md | 5 +++++ packages/connectivity/connectivity/CHANGELOG.md | 4 ++++ packages/connectivity/connectivity_for_web/CHANGELOG.md | 4 ++++ packages/google_sign_in/google_sign_in/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker/CHANGELOG.md | 4 ++++ packages/in_app_purchase/CHANGELOG.md | 4 ++++ packages/local_auth/CHANGELOG.md | 4 ++++ packages/package_info/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider/CHANGELOG.md | 4 ++++ packages/quick_actions/CHANGELOG.md | 4 ++++ packages/sensors/CHANGELOG.md | 4 ++++ packages/share/CHANGELOG.md | 4 ++++ packages/shared_preferences/shared_preferences/CHANGELOG.md | 4 ++++ 13 files changed, 53 insertions(+) diff --git a/packages/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md index 7b948981d3f0..c47879ce0419 100644 --- a/packages/battery/CHANGELOG.md +++ b/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 diff --git a/packages/connectivity/connectivity/CHANGELOG.md b/packages/connectivity/connectivity/CHANGELOG.md index 9cecf8cd1489..27a1bb100e74 100644 --- a/packages/connectivity/connectivity/CHANGELOG.md +++ b/packages/connectivity/connectivity/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.9+2 + +* Update package:e2e to use package:integration_test + ## 0.4.9+1 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/connectivity/connectivity_for_web/CHANGELOG.md b/packages/connectivity/connectivity_for_web/CHANGELOG.md index 906b0fce2d9d..4c10ee64e855 100644 --- a/packages/connectivity/connectivity_for_web/CHANGELOG.md +++ b/packages/connectivity/connectivity_for_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.1+2 + +* Update package:e2e to use package:integration_test + ## 0.3.1+1 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/google_sign_in/google_sign_in/CHANGELOG.md b/packages/google_sign_in/google_sign_in/CHANGELOG.md index 761ba0476eff..e0212458a549 100644 --- a/packages/google_sign_in/google_sign_in/CHANGELOG.md +++ b/packages/google_sign_in/google_sign_in/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.5.3 + +* Update package:e2e -> package:integration_test + ## 4.5.2 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index 82bb5f37cf97..197314292f8f 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.7+6 + +* Update package:e2e -> package:integration_test + ## 0.6.7+5 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/CHANGELOG.md index 7e2eb3079396..ad53c7ccf1f5 100644 --- a/packages/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.4+4 + +* Update package:e2e -> package:integration_test + ## 0.3.4+3 * Fixed typo 'manuelly' for 'manually'. diff --git a/packages/local_auth/CHANGELOG.md b/packages/local_auth/CHANGELOG.md index d6c5f618dcd6..e9e09d825505 100644 --- a/packages/local_auth/CHANGELOG.md +++ b/packages/local_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.2+5 + +* Update package:e2e -> package:integration_test + ## 0.6.2+4 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index 5b5c78144efc..f88c270d92a3 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.3 + +* Update package:e2e -> package:integration_test + ## 0.4.2 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/path_provider/path_provider/CHANGELOG.md b/packages/path_provider/path_provider/CHANGELOG.md index eab5b5f62a2d..07778d5ccef3 100644 --- a/packages/path_provider/path_provider/CHANGELOG.md +++ b/packages/path_provider/path_provider/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.6.14 + +* Update package:e2e -> package:integration_test + ## 1.6.13 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/quick_actions/CHANGELOG.md b/packages/quick_actions/CHANGELOG.md index f1f7f85de08b..b850014e2bf0 100644 --- a/packages/quick_actions/CHANGELOG.md +++ b/packages/quick_actions/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.0+8 + +* Update package:e2e -> package:integration_test + ## 0.4.0+7 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md index 236618d3d34a..cd70351e1c2b 100644 --- a/packages/sensors/CHANGELOG.md +++ b/packages/sensors/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.4.2+4 + +* Update package:e2e -> package:integration_test + ## 0.4.2+3 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/share/CHANGELOG.md b/packages/share/CHANGELOG.md index e18933d1be0f..8c3814d2f559 100644 --- a/packages/share/CHANGELOG.md +++ b/packages/share/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.4+5 + +* Update package:e2e -> package:integration_test + ## 0.6.4+4 * Update package:e2e reference to use the local version in the flutter/plugins diff --git a/packages/shared_preferences/shared_preferences/CHANGELOG.md b/packages/shared_preferences/shared_preferences/CHANGELOG.md index 52f1c1e28ac6..3f4edca10dc2 100644 --- a/packages/shared_preferences/shared_preferences/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.10 + +* Update package:e2e -> package:integration_test + ## 0.5.9 * Update package:e2e reference to use the local version in the flutter/plugins From 125da709ae81746c6350c2f58b3b66901747db94 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 12 Aug 2020 22:07:26 -0700 Subject: [PATCH 10/20] oops --- packages/device_info/device_info/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/device_info/device_info/example/pubspec.yaml b/packages/device_info/device_info/example/pubspec.yaml index fdbfd774ce90..e22f6026ba69 100644 --- a/packages/device_info/device_info/example/pubspec.yaml +++ b/packages/device_info/device_info/example/pubspec.yaml @@ -11,7 +11,7 @@ dev_dependencies: flutter_driver: sdk: flutter integration_test: - path: ../../integration_test + path: ../../../integration_test pedantic: ^1.8.0 flutter: From e876f02d7b6660cb4996aa9f27556e379f7fc597 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 13 Aug 2020 17:05:50 -0700 Subject: [PATCH 11/20] java package name --- .../java/io/plugins/androidalarmmanager/MainActivityTest.java | 2 +- .../plugins/androidintentexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/androidintentexample/MainActivityTest.java | 2 +- .../io/flutter/plugins/battery/EmbedderV1ActivityTest.java | 2 +- .../java/io/flutter/plugins/battery/FlutterActivityTest.java | 2 +- .../io/flutter/plugins/batteryexample/EmbedderV1Activity.java | 4 ++-- .../plugins/cameraexample/EmbeddingV1ActivityTest.java | 2 +- .../io/flutter/plugins/cameraexample/FlutterActivityTest.java | 2 +- .../io/flutter/plugins/cameraexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/connectivityexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/connectivityexample/FlutterActivityTest.java | 2 +- .../plugins/connectivityexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/connectivityexample/FlutterActivityTest.java | 2 +- .../plugins/deviceinfoexample/EmbeddingV1ActivityTest.java | 2 +- .../EmbeddingV1ActivityTest.java | 2 +- .../flutter_plugin_android_lifecycle/MainActivityTest.java | 2 +- .../EmbeddingV1Activity.java | 4 ++-- .../MainActivity.java | 2 +- .../flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java | 2 +- .../java/io/flutter/plugins/googlemaps/MainActivityTest.java | 2 +- .../plugins/googlemapsexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/googlesigninexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/googlesigninexample/FlutterActivityTest.java | 2 +- .../plugins/googlesigninexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/googlesigninexample/FlutterActivityTest.java | 2 +- .../plugins/imagepickerexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/imagepickerexample/FlutterActivityTest.java | 2 +- .../plugins/inapppurchaseexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/inapppurchaseexample/FlutterActivityTest.java | 2 +- .../flutter/plugins/integrationTest/FlutterTestRunner.java | 2 +- .../plugins/integrationTest/IntegrationTestPlugin.java | 2 +- .../java/com/example/e2e_example/EmbedderV1ActivityTest.java | 2 +- .../java/com/example/e2e_example/FlutterActivityTest.java | 2 +- .../e2e_example/FlutterActivityWithPermissionTest.java | 2 +- .../main/java/com/example/e2e_example/EmbedderV1Activity.java | 4 ++-- .../io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java | 2 +- .../java/io/flutter/plugins/localauth/MainActivityTest.java | 2 +- .../flutter/plugins/localauthexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/packageinfoexample/EmbedderV1ActivityTest.java | 2 +- .../flutter/plugins/packageinfoexample/MainActivityTest.java | 2 +- .../app/src/androidTest/java/EmbeddingV1ActivityTest.java | 2 +- .../android/app/src/androidTest/java/MainActivityTest.java | 2 +- .../plugins/pathproviderexample/EmbeddingV1Activity.java | 4 ++-- .../app/src/androidTest/java/EmbeddingV1ActivityTest.java | 2 +- .../android/app/src/androidTest/java/MainActivityTest.java | 2 +- .../io/flutter/plugins/pathproviderexample/MainActivity.java | 2 +- .../plugins/quickactionsexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/quickactionsexample/FlutterActivityTest.java | 2 +- .../flutter/plugins/sensorsexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/sensorsexample/EmbeddingV1ActivityTest.java | 2 +- .../flutter/plugins/sensorsexample/FlutterActivityTest.java | 2 +- .../io/flutter/plugins/shareexample/EmbeddingV1Activity.java | 4 ++-- .../flutter/plugins/shareexample/EmbeddingV1ActivityTest.java | 2 +- .../io/flutter/plugins/shareexample/FlutterActivityTest.java | 2 +- .../plugins/sharedpreferencesexample/EmbeddingV1Activity.java | 4 ++-- .../sharedpreferencesexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/sharedpreferencesexample/FlutterActivityTest.java | 2 +- .../plugins/urllauncherexample/EmbeddingV1ActivityTest.java | 2 +- .../flutter/plugins/urllauncherexample/MainActivityTest.java | 2 +- .../plugins/urllauncherexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/urllauncherexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/urllauncherexample/FlutterActivityTest.java | 2 +- .../plugins/urllauncherexample/EmbeddingV1Activity.java | 4 ++-- .../plugins/videoplayerexample/EmbeddingV1Activity.java | 4 ++-- .../webviewflutterexample/EmbeddingV1ActivityTest.java | 2 +- .../plugins/webviewflutterexample/MainActivityTest.java | 2 +- .../plugins/webviewflutterexample/EmbeddingV1Activity.java | 4 ++-- 68 files changed, 83 insertions(+), 83 deletions(-) diff --git a/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java b/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java index 63dede1c4520..373e770697d5 100644 --- a/packages/android_alarm_manager/example/android/app/src/androidTest/java/io/plugins/androidalarmmanager/MainActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java index f591d86db253..7ab0e87e7c5a 100644 --- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/EmbeddingV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java b/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java index 4c8319927022..619dbcd853e7 100644 --- a/packages/android_intent/example/android/app/src/androidTestDebug/java/io/flutter/plugins/androidintentexample/MainActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java index c75610db850d..1bd860eb147c 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/EmbedderV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java b/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java index 64df46e3f837..636c716d7a91 100644 --- a/packages/battery/example/android/app/src/androidTest/java/io/flutter/plugins/battery/FlutterActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 25d8ec82b06e..57f2e339a6bf 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/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.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.battery.BatteryPlugin; @@ -15,6 +15,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); BatteryPlugin.registerWith(registrarFor("io.flutter.plugins.battery.BatteryPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); } } diff --git a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java index 04ac80c79287..3149191b478d 100644 --- a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java b/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java index c45f653e8f5c..c90c66defc32 100644 --- a/packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java +++ b/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.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index d336bd2126fb..600879738833 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/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.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.camera.CameraPlugin; import io.flutter.plugins.pathprovider.PathProviderPlugin; @@ -13,7 +13,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); CameraPlugin.registerWith(registrarFor("io.flutter.plugins.camera.CameraPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); VideoPlayerPlugin.registerWith( diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java index 839f272a836e..048da070991e 100644 --- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java +++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java index 68fbf183fb29..0f0dcf2555f3 100644 --- a/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java +++ b/packages/connectivity/connectivity/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java index 839f272a836e..048da070991e 100644 --- a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java +++ b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java index 68fbf183fb29..0f0dcf2555f3 100644 --- a/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java +++ b/packages/connectivity/connectivity_macos/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.connectivityexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java index a9eecd1341de..797c06aa50b2 100644 --- a/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java +++ b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.deviceinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java index 987b67ba2610..4f1435fb1b33 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java index 2760e227fca4..4c3c9a247883 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/androidTest/java/io/flutter/plugins/flutter_plugin_android_lifecycle/MainActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index 886d401be40a..73ba46be63dc 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; @@ -10,7 +10,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java index 84883f690856..779d5de6bf47 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java @@ -6,7 +6,7 @@ import android.util.Log; import androidx.lifecycle.Lifecycle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.plugins.FlutterPlugin; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java index fef9d8383a27..d8064e441fbd 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemaps; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.plugins.googlemapsexample.*; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java index 375e47fea27a..c70f16a17454 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/androidTest/java/io/flutter/plugins/googlemaps/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemaps; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index 54ab75c76eb3..3b08b89046d7 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.googlemapsexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.googlemaps.GoogleMapsPlugin; @@ -11,6 +11,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); GoogleMapsPlugin.registerWith(registrarFor("io.flutter.plugins.googlemaps.GoogleMapsPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); } } diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java index d67badfd61b3..4d872e7eb5a1 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java index 2cb11396b34b..f9aa77b30e5d 100644 --- a/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java +++ b/packages/google_sign_in/extension_google_sign_in_as_googleapis_auth/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java index d67badfd61b3..4d872e7eb5a1 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java index 2cb11396b34b..f9aa77b30e5d 100644 --- a/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java +++ b/packages/google_sign_in/google_sign_in/example/android/app/src/main/java/io/flutter/plugins/googlesigninexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.googlesigninexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java index 6df2aa6c581d..0a8330d734bd 100644 --- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java +++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.imagepickerexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java index 47d833ccfba8..58f8df35dc4f 100644 --- a/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java +++ b/packages/image_picker/image_picker/example/android/app/src/main/java/io/flutter/plugins/imagepickerexample/FlutterActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.imagepickerexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index cc91af5023da..28e7e9ddd210 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.inapppurchase.InAppPurchasePlugin; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; @@ -15,7 +15,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); InAppPurchasePlugin.registerWith( diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java index c9dd6dff0717..b8ca3ae96e2c 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java index 81c1d8f34ec1..15ec0da9958e 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java index b5a5c54df1d2..511fc141a917 100644 --- a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java +++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.integrationTest; +package dev.flutter.plugins.integration_test; import android.util.Log; import androidx.test.rule.ActivityTestRule; diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java index 4ac21851809e..2245b33ba4c3 100644 --- a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java +++ b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package dev.flutter.plugins.integrationTest; +package dev.flutter.plugins.integration_test; import android.content.Context; import com.google.common.util.concurrent.SettableFuture; diff --git a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java index 48d59d394592..0ce7dc14d4a5 100644 --- a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/EmbedderV1ActivityTest.java @@ -1,7 +1,7 @@ package com.example.integration_test_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java index ea3de1e7cb9c..36ae1ddfc7e8 100644 --- a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityTest.java @@ -1,7 +1,7 @@ package com.example.integration_test_example; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java index 2d2da6385062..c01d23466fed 100644 --- a/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java +++ b/packages/integration_test/example/android/app/src/androidTest/java/com/example/e2e_example/FlutterActivityWithPermissionTest.java @@ -3,7 +3,7 @@ import android.Manifest.permission; import androidx.test.rule.ActivityTestRule; import androidx.test.rule.GrantPermissionRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java index db69dabe7fd5..6007ce705eaa 100644 --- a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java +++ b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java @@ -5,7 +5,7 @@ package com.example.integration_test_example; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; public class EmbedderV1Activity extends FlutterActivity { @@ -13,6 +13,6 @@ public class EmbedderV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); } } diff --git a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java index 63fae64bae4c..6b125e4cf8e2 100644 --- a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java +++ b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauth; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.plugins.localauthexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java index 37c97eef799a..3d2d55bce0fa 100644 --- a/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java +++ b/packages/local_auth/example/android/app/src/androidTest/java/io/flutter/plugins/localauth/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauth; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterFragmentActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index ec9f5d3b044c..b1534ef4ac92 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -1,7 +1,7 @@ package io.flutter.plugins.localauthexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterFragmentActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; import io.flutter.plugins.localauth.LocalAuthPlugin; @@ -11,7 +11,7 @@ public class EmbeddingV1Activity extends FlutterFragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java index 810e514e6ec1..ab1d2d29635e 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/EmbedderV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java index 1c606b801fed..91aad52d4241 100644 --- a/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java +++ b/packages/package_info/example/android/app/src/androidTest/java/io/flutter/plugins/packageinfoexample/MainActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.packageinfoexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java index c7beac3b34fd..50cb342715cb 100644 --- a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java +++ b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java index 28cc32e9279b..a99767c4ccf9 100644 --- a/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java +++ b/packages/path_provider/path_provider/example/android/app/src/androidTest/java/MainActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index 3d52b9f2a351..2b8d684daa88 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathproviderexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.pathprovider.PathProviderPlugin; @@ -11,7 +11,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); } diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java index c7beac3b34fd..50cb342715cb 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.EmbeddingV1Activity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java index 9c0965f6911a..09e000524a69 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/androidTest/java/MainActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.pathprovider; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.plugins.pathproviderexample.MainActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java index 6574cede8e47..9e89f2949622 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java @@ -4,7 +4,7 @@ package io.flutter.plugins.pathproviderexample; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java index 6d7bd56a8c6f..6fc6778159e5 100644 --- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java +++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/EmbeddingV1ActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.quickactionsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java index 1eba7115cc42..9ce1e8dfe4ea 100644 --- a/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java +++ b/packages/quick_actions/example/android/app/src/main/java/io/flutter/plugins/quickactionsexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.quickactionsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 6a6f65e4f5d3..556b3f253759 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sensorsexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sensors.SensorsPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); SensorsPlugin.registerWith(registrarFor("io.flutter.plugins.sensors.SensorsPlugin")); } } diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java index 99d12ea2299d..ace170bb78ac 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.sensorsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java index 96a40538d317..0835b0f5945a 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sensorsexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index b903d6abd027..9c659a8244dc 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.shareexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.share.SharePlugin; @@ -15,7 +15,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); SharePlugin.registerWith(registrarFor("io.flutter.plugins.share.SharePlugin")); } } diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java index 0ced69d7d346..b5ae4ef061b6 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.shareexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java index 18f291f71b8f..3b73737f15b2 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.shareexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index 2ec9a2765df3..5b6badbadaff 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sharedpreferencesexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; @@ -15,7 +15,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); } diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java index 63ca86a0cced..d37f5549e3ec 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1ActivityTest.java @@ -2,7 +2,7 @@ package io.flutter.plugins.sharedpreferencesexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java index 7f11cf2a142c..7a63d6d90c91 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/FlutterActivityTest.java @@ -5,7 +5,7 @@ package io.flutter.plugins.sharedpreferencesexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java index 301178e8cd5e..fb66478feed8 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java index ff6fc8bd6b59..5b50523f7f40 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index d5509ff873d9..1fe2783ab508 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; @@ -15,7 +15,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java index 301178e8cd5e..fb66478feed8 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java index ff6fc8bd6b59..5b50523f7f40 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/androidTestDebug/java/io/flutter/plugins/urllauncherexample/FlutterActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.urllauncherexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index d5509ff873d9..1fe2783ab508 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; @@ -15,7 +15,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index 9fe6e8249261..9ed577d84a14 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.videoplayerexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.videoplayer.VideoPlayerPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); VideoPlayerPlugin.registerWith( registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin")); } diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java index 587448b2e5be..8f253d8dc74f 100644 --- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java +++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1ActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.webviewflutterexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java index 3198fd092c2e..a9b1a9412cbd 100644 --- a/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java +++ b/packages/webview_flutter/example/android/app/src/androidTestDebug/java/io/flutter/plugins/webviewflutterexample/MainActivityTest.java @@ -1,7 +1,7 @@ package io.flutter.plugins.webviewflutterexample; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.integrationTest.FlutterTestRunner; +import dev.flutter.plugins.integration_test.FlutterTestRunner; import io.flutter.embedding.android.FlutterActivity; import org.junit.Rule; import org.junit.runner.RunWith; diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index 4d9239a3c7df..8910e364ccfa 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -5,7 +5,7 @@ package io.flutter.plugins.webviewflutterexample; import android.os.Bundle; -import dev.flutter.plugins.integrationTest.IntegrationTestPlugin; +import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin; @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integrationTest.IntegrationTestPlugin")); + registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); WebViewFlutterPlugin.registerWith( registrarFor("io.flutter.plugins.webviewflutter.WebViewFlutterPlugin")); } From 6d8b88e1c9e5f604846d100f36011c48658e0898 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Thu, 13 Aug 2020 20:29:06 -0700 Subject: [PATCH 12/20] readme update, missing rename --- packages/e2e/README.md | 197 +++++++++++++++++++++++++ packages/integration_test/pubspec.yaml | 2 +- 2 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 packages/e2e/README.md diff --git a/packages/e2e/README.md b/packages/e2e/README.md new file mode 100644 index 000000000000..eb62cec8e23c --- /dev/null +++ b/packages/e2e/README.md @@ -0,0 +1,197 @@ +# e2e (deprecated) + +## DEPRECATED + +This package has been moved to [integration_test](https://github.com/flutter/plugins/tree/master/packages/integration_test). + +## Old instructions + +This package enables self-driving testing of Flutter code on devices and emulators. +It adapts flutter_test results into a format that is compatible with `flutter drive` +and native Android instrumentation testing. + +iOS support is not available yet, but is planned in the future. + +## Usage + +Add a dependency on the `e2e` package in the +`dev_dependencies` section of pubspec.yaml. For plugins, do this in the +pubspec.yaml of the example app. + +Invoke `E2EWidgetsFlutterBinding.ensureInitialized()` at the start +of a test file, e.g. + +```dart +import 'package:e2e/e2e.dart'; + +void main() { + E2EWidgetsFlutterBinding.ensureInitialized(); + testWidgets("failing test example", (WidgetTester tester) async { + expect(2 + 2, equals(5)); + }); +} +``` + +## Test locations + +It is recommended to put e2e tests in the `test/` folder of the app or package. +For example apps, if the e2e test references example app code, it should go in +`example/test/`. It is also acceptable to put e2e tests in `test_driver/` folder +so that they're alongside the runner app (see below). + +## Using Flutter driver to run tests + +`E2EWidgetsTestBinding` supports launching the on-device tests with `flutter drive`. +Note that the tests don't use the `FlutterDriver` API, they use `testWidgets` instead. + +Put the a file named `_e2e_test.dart` in the app' `test_driver` directory: + +```dart +import 'dart:async'; + +import 'package:e2e/e2e_driver.dart' as e2e; + +Future main() async => e2e.main(); + +``` + +To run a example app test with Flutter driver: + +``` +cd example +flutter drive test/_e2e.dart +``` + +To test plugin APIs using Flutter driver: + +``` +cd example +flutter drive --driver=test_driver/_test.dart test/_e2e.dart +``` + +You can run tests on web in release or profile mode. + +First you need to make sure you have downloaded the driver for the browser. + +``` +cd example +flutter drive -v --target=test_driver/dart -d web-server --release --browser-name=chrome +``` + +## Android device testing + +Create an instrumentation test file in your application's +**android/app/src/androidTest/java/com/example/myapp/** directory (replacing +com, example, and myapp with values from your app's package name). You can name +this test file MainActivityTest.java or another name of your choice. + +```java +package com.example.myapp; + +import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.e2e.FlutterTestRunner; +import org.junit.Rule; +import org.junit.runner.RunWith; + +@RunWith(FlutterTestRunner.class) +public class MainActivityTest { + @Rule + public ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class, true, false); +} +``` + +Update your application's **myapp/android/app/build.gradle** to make sure it +uses androidx's version of AndroidJUnitRunner and has androidx libraries as a +dependency. + +``` +android { + ... + defaultConfig { + ... + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } +} + +dependencies { + testImplementation 'junit:junit:4.12' + + // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0 + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} +``` + +To e2e test on a local Android device (emulated or physical): + +``` +./gradlew app:connectedAndroidTest -Ptarget=`pwd`/../test_driver/_e2e.dart +``` + +## Firebase Test Lab + +If this is your first time testing with Firebase Test Lab, you'll need to follow +the guides in the [Firebase test lab +documentation](https://firebase.google.com/docs/test-lab/?gclid=EAIaIQobChMIs5qVwqW25QIV8iCtBh3DrwyUEAAYASAAEgLFU_D_BwE) +to set up a project. + +To run an e2e test on Android devices using Firebase Test Lab, use gradle commands to build an +instrumentation test for Android, after creating `androidTest` as suggested in the last section. + +```bash +pushd android +# flutter build generates files in android/ for building the app +flutter build apk +./gradlew app:assembleAndroidTest +./gradlew app:assembleDebug -Ptarget=.dart +popd +``` + +Upload the build apks Firebase Test Lab, making sure to replace , +, , and with your values. + +```bash +gcloud auth activate-service-account --key-file= +gcloud --quiet config set project +gcloud firebase test android run --type instrumentation \ + --app build/app/outputs/apk/debug/app-debug.apk \ + --test build/app/outputs/apk/androidTest/debug/app-debug-androidTest.apk\ + --timeout 2m \ + --results-bucket= \ + --results-dir= +``` + +You can pass additional parameters on the command line, such as the +devices you want to test on. See +[gcloud firebase test android run](https://cloud.google.com/sdk/gcloud/reference/firebase/test/android/run). + +## iOS device testing + +You need to change `iOS/Podfile` to avoid test target statically linking to the plugins. One way is to +link all of the plugins dynamically: + +``` +target 'Runner' do + use_frameworks! + ... +end +``` + +To e2e test on your iOS device (simulator or real), rebuild your iOS targets with Flutter tool. + +``` +flutter build ios -t test_driver/_e2e.dart (--simulator) +``` + +Open Xcode project (by default, it's `ios/Runner.xcodeproj`). Create a test target +(navigating `File > New > Target...` and set up the values) and a test file `RunnerTests.m` and +change the code. You can change `RunnerTests.m` to the name of your choice. + +```objective-c +#import +#import + +E2E_IOS_RUNNER(RunnerTests) +``` + +Now you can start RunnerTests to kick out e2e tests! diff --git a/packages/integration_test/pubspec.yaml b/packages/integration_test/pubspec.yaml index 96849a2721e0..b222531044e9 100644 --- a/packages/integration_test/pubspec.yaml +++ b/packages/integration_test/pubspec.yaml @@ -23,7 +23,7 @@ flutter: plugin: platforms: android: - package: dev.flutter.plugins.integrationTest + package: dev.flutter.plugins.integration_test pluginClass: IntegrationTestPlugin ios: pluginClass: IntegrationTestPlugin From f8ee245a0c9631486fdde98a800cead40abad876 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Fri, 14 Aug 2020 14:41:23 -0700 Subject: [PATCH 13/20] format --- .../io/flutter/plugins/batteryexample/EmbedderV1Activity.java | 1 - .../io/flutter/plugins/cameraexample/EmbeddingV1Activity.java | 1 - .../EmbeddingV1Activity.java | 1 - .../flutter_plugin_android_lifecycle_example/MainActivity.java | 1 - .../flutter/plugins/googlemapsexample/EmbeddingV1Activity.java | 1 - .../plugins/inapppurchaseexample/EmbeddingV1Activity.java | 1 - .../main/java/com/example/e2e_example/EmbedderV1Activity.java | 1 - .../io/flutter/plugins/localauthexample/EmbeddingV1Activity.java | 1 - .../flutter/plugins/pathproviderexample/EmbeddingV1Activity.java | 1 - .../io/flutter/plugins/pathproviderexample/MainActivity.java | 1 - .../io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java | 1 - .../io/flutter/plugins/shareexample/EmbeddingV1Activity.java | 1 - .../plugins/sharedpreferencesexample/EmbeddingV1Activity.java | 1 - .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 1 - .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 1 - .../flutter/plugins/videoplayerexample/EmbeddingV1Activity.java | 1 - .../plugins/webviewflutterexample/EmbeddingV1Activity.java | 1 - 17 files changed, 17 deletions(-) diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 57f2e339a6bf..8aae4cadd7e8 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.batteryexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.battery.BatteryPlugin; diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index 600879738833..4c2ddfd12a0f 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java @@ -1,7 +1,6 @@ package io.flutter.plugins.cameraexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.camera.CameraPlugin; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index 73ba46be63dc..e9d7911b42eb 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -1,7 +1,6 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java index 779d5de6bf47..7ea28f7edf06 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java @@ -6,7 +6,6 @@ import android.util.Log; import androidx.lifecycle.Lifecycle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.plugins.FlutterPlugin; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index 3b08b89046d7..67860da0f7b4 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -1,7 +1,6 @@ package io.flutter.plugins.googlemapsexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.googlemaps.GoogleMapsPlugin; diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index 28e7e9ddd210..253cb7d66094 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.inapppurchaseexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.inapppurchase.InAppPurchasePlugin; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; diff --git a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java index 6007ce705eaa..8b080352de00 100644 --- a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java +++ b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java @@ -5,7 +5,6 @@ package com.example.integration_test_example; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; public class EmbedderV1Activity extends FlutterActivity { diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index b1534ef4ac92..9bcdda745adb 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -1,7 +1,6 @@ package io.flutter.plugins.localauthexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterFragmentActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; import io.flutter.plugins.localauth.LocalAuthPlugin; diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index 2b8d684daa88..22a31a1753af 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -2,7 +2,6 @@ package io.flutter.plugins.pathproviderexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java index 9e89f2949622..4664ad89129c 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java @@ -4,7 +4,6 @@ package io.flutter.plugins.pathproviderexample; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 556b3f253759..5589d22c2068 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.sensorsexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sensors.SensorsPlugin; diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index 9c659a8244dc..b33c54bc27d3 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.shareexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.share.SharePlugin; diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index 5b6badbadaff..ccf8cd1e3da6 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.sharedpreferencesexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 1fe2783ab508..81f472c0e212 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 1fe2783ab508..81f472c0e212 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index 9ed577d84a14..4fbafb06149e 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.videoplayerexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.videoplayer.VideoPlayerPlugin; diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index 8910e364ccfa..4a94fd351c73 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -5,7 +5,6 @@ package io.flutter.plugins.webviewflutterexample; import android.os.Bundle; -import dev.flutter.plugins.integration_test.integration_testPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin; From 111683e98e265e5524b7698fd360b2a875d5b43d Mon Sep 17 00:00:00 2001 From: Dan Field Date: Fri, 14 Aug 2020 14:43:30 -0700 Subject: [PATCH 14/20] readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 026dd9d7739b..b2015a705e79 100644 --- a/README.md +++ b/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) | From b5b4c836c0f61a717a4d238bace66d0fc9ff332b Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 17 Aug 2020 09:02:17 -0700 Subject: [PATCH 15/20] naming --- packages/integration_test/README.md | 2 +- .../FlutterTestRunner.java | 0 .../IntegrationTestPlugin.java | 0 packages/integration_test/lib/integration_test_driver.dart | 3 --- 4 files changed, 1 insertion(+), 4 deletions(-) rename packages/integration_test/android/src/main/java/dev/flutter/plugins/{integrationTest => integration_test}/FlutterTestRunner.java (100%) rename packages/integration_test/android/src/main/java/dev/flutter/plugins/{integrationTest => integration_test}/IntegrationTestPlugin.java (100%) diff --git a/packages/integration_test/README.md b/packages/integration_test/README.md index 5218235cf9bc..429ed95640b0 100644 --- a/packages/integration_test/README.md +++ b/packages/integration_test/README.md @@ -48,7 +48,7 @@ import 'dart:async'; import 'package:integration_test/integration_test_driver.dart'; -Future main() async => integration_main(); +Future main() async => integrationDriver(); ``` diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/FlutterTestRunner.java similarity index 100% rename from packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/FlutterTestRunner.java rename to packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/FlutterTestRunner.java diff --git a/packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java b/packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java similarity index 100% rename from packages/integration_test/android/src/main/java/dev/flutter/plugins/integrationTest/IntegrationTestPlugin.java rename to packages/integration_test/android/src/main/java/dev/flutter/plugins/integration_test/IntegrationTestPlugin.java diff --git a/packages/integration_test/lib/integration_test_driver.dart b/packages/integration_test/lib/integration_test_driver.dart index dc22cae8b292..e5160b4e8d68 100644 --- a/packages/integration_test/lib/integration_test_driver.dart +++ b/packages/integration_test/lib/integration_test_driver.dart @@ -11,9 +11,6 @@ import 'package:flutter_driver/flutter_driver.dart'; import 'package:integration_test/common.dart'; import 'package:path/path.dart' as path; -/// This method remains for backword compatibility. -Future integration_main() => integrationDriver(); - /// Flutter Driver test output directory. /// /// Tests should write any output files to this directory. Defaults to the path From 4e2cf3b909be40854a3b7f324d9e06ab971283ae Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 17 Aug 2020 10:18:56 -0700 Subject: [PATCH 16/20] more --- .../io/flutter/plugins/batteryexample/EmbedderV1Activity.java | 2 +- .../io/flutter/plugins/cameraexample/EmbeddingV1Activity.java | 2 +- .../EmbeddingV1Activity.java | 2 +- .../flutter/plugins/googlemapsexample/EmbeddingV1Activity.java | 2 +- .../plugins/inapppurchaseexample/EmbeddingV1Activity.java | 2 +- .../main/java/com/example/e2e_example/EmbedderV1Activity.java | 2 +- .../flutter/plugins/localauthexample/EmbeddingV1Activity.java | 2 +- .../plugins/pathproviderexample/EmbeddingV1Activity.java | 2 +- .../io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java | 2 +- .../io/flutter/plugins/shareexample/EmbeddingV1Activity.java | 2 +- .../plugins/sharedpreferencesexample/EmbeddingV1Activity.java | 2 +- .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 2 +- .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 2 +- .../flutter/plugins/videoplayerexample/EmbeddingV1Activity.java | 2 +- .../plugins/webviewflutterexample/EmbeddingV1Activity.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index 8aae4cadd7e8..fd837627c3b5 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -14,6 +14,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); BatteryPlugin.registerWith(registrarFor("io.flutter.plugins.battery.BatteryPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); } } diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index 4c2ddfd12a0f..406412d3097f 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java @@ -12,7 +12,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); CameraPlugin.registerWith(registrarFor("io.flutter.plugins.camera.CameraPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); VideoPlayerPlugin.registerWith( diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index e9d7911b42eb..9ee9e0dbf692 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -9,7 +9,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index 67860da0f7b4..772dc054fed1 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -10,6 +10,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); GoogleMapsPlugin.registerWith(registrarFor("io.flutter.plugins.googlemaps.GoogleMapsPlugin")); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); } } diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index 253cb7d66094..803fe6f71685 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); InAppPurchasePlugin.registerWith( diff --git a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java index 8b080352de00..c0a700c0daeb 100644 --- a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java +++ b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java @@ -12,6 +12,6 @@ public class EmbedderV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); } } diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index 9bcdda745adb..c0edfc9d5c8f 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -10,7 +10,7 @@ public class EmbeddingV1Activity extends FlutterFragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); FlutterAndroidLifecyclePlugin.registerWith( registrarFor( "io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin")); diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index 22a31a1753af..151282771552 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -10,7 +10,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); PathProviderPlugin.registerWith( registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin")); } diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index 5589d22c2068..a9776a41e446 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); SensorsPlugin.registerWith(registrarFor("io.flutter.plugins.sensors.SensorsPlugin")); } } diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index b33c54bc27d3..a46397941ed3 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); SharePlugin.registerWith(registrarFor("io.flutter.plugins.share.SharePlugin")); } } diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index ccf8cd1e3da6..bc7342035b7c 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); SharedPreferencesPlugin.registerWith( registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin")); } diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 81f472c0e212..2593e8094698 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 81f472c0e212..2593e8094698 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -14,7 +14,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); UrlLauncherPlugin.registerWith( registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); } diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index 4fbafb06149e..d2498ca8e0c6 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); VideoPlayerPlugin.registerWith( registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin")); } diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index 4a94fd351c73..1e5859af2c47 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -13,7 +13,7 @@ public class EmbeddingV1Activity extends FlutterActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); IntegrationTestPlugin.registerWith( - registrarFor("dev.flutter.plugins.integration_test.integration_testPlugin")); + registrarFor("dev.flutter.plugins.integration_test.IntegrationTestPlugin")); WebViewFlutterPlugin.registerWith( registrarFor("io.flutter.plugins.webviewflutter.WebViewFlutterPlugin")); } From f05bb437e319e8d5986c60acecf0c875c0dbc6e3 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 17 Aug 2020 10:55:41 -0700 Subject: [PATCH 17/20] missing imports --- .../io/flutter/plugins/batteryexample/EmbedderV1Activity.java | 1 + .../io/flutter/plugins/cameraexample/EmbeddingV1Activity.java | 1 + .../EmbeddingV1Activity.java | 1 + .../flutter/plugins/googlemapsexample/EmbeddingV1Activity.java | 1 + .../main/java/com/example/e2e_example/EmbedderV1Activity.java | 1 + .../io/flutter/plugins/localauthexample/EmbeddingV1Activity.java | 1 + .../flutter/plugins/pathproviderexample/EmbeddingV1Activity.java | 1 + .../io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java | 1 + .../io/flutter/plugins/shareexample/EmbeddingV1Activity.java | 1 + .../plugins/sharedpreferencesexample/EmbeddingV1Activity.java | 1 + .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 1 + .../flutter/plugins/urllauncherexample/EmbeddingV1Activity.java | 1 + .../flutter/plugins/videoplayerexample/EmbeddingV1Activity.java | 1 + .../plugins/webviewflutterexample/EmbeddingV1Activity.java | 1 + 14 files changed, 14 insertions(+) diff --git a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java index fd837627c3b5..5fa885cdd9d8 100644 --- a/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java +++ b/packages/battery/example/android/app/src/main/java/io/flutter/plugins/batteryexample/EmbedderV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.batteryexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.battery.BatteryPlugin; diff --git a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java index 406412d3097f..c0ef7d891bfc 100644 --- a/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java +++ b/packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java @@ -1,6 +1,7 @@ package io.flutter.plugins.cameraexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.camera.CameraPlugin; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java index 9ee9e0dbf692..63602ddb05e6 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/EmbeddingV1Activity.java @@ -1,6 +1,7 @@ package io.flutter.plugins.flutter_plugin_android_lifecycle_example; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; diff --git a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java index 772dc054fed1..18b107d47620 100644 --- a/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java +++ b/packages/google_maps_flutter/google_maps_flutter/example/android/app/src/main/java/io/flutter/plugins/googlemapsexample/EmbeddingV1Activity.java @@ -1,6 +1,7 @@ package io.flutter.plugins.googlemapsexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.googlemaps.GoogleMapsPlugin; diff --git a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java index c0a700c0daeb..9318e457800d 100644 --- a/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java +++ b/packages/integration_test/example/android/app/src/main/java/com/example/e2e_example/EmbedderV1Activity.java @@ -5,6 +5,7 @@ package com.example.integration_test_example; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; public class EmbedderV1Activity extends FlutterActivity { diff --git a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java index c0edfc9d5c8f..456d5407c4be 100644 --- a/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java +++ b/packages/local_auth/example/android/app/src/main/java/io/flutter/plugins/localauthexample/EmbeddingV1Activity.java @@ -1,6 +1,7 @@ package io.flutter.plugins.localauthexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterFragmentActivity; import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin; import io.flutter.plugins.localauth.LocalAuthPlugin; diff --git a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java index 151282771552..6c4a6185359c 100644 --- a/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java +++ b/packages/path_provider/path_provider/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/EmbeddingV1Activity.java @@ -2,6 +2,7 @@ package io.flutter.plugins.pathproviderexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.pathprovider.PathProviderPlugin; diff --git a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java index a9776a41e446..390819ba0e49 100644 --- a/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java +++ b/packages/sensors/example/android/app/src/main/java/io/flutter/plugins/sensorsexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.sensorsexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sensors.SensorsPlugin; diff --git a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java index a46397941ed3..70b1a8d8f09e 100644 --- a/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java +++ b/packages/share/example/android/app/src/main/java/io/flutter/plugins/shareexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.shareexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.share.SharePlugin; diff --git a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java index bc7342035b7c..7a748792f566 100644 --- a/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java +++ b/packages/shared_preferences/shared_preferences/example/android/app/src/main/java/io/flutter/plugins/sharedpreferencesexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.sharedpreferencesexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; diff --git a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 2593e8094698..39afc642ddb9 100644 --- a/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; diff --git a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java index 2593e8094698..39afc642ddb9 100644 --- a/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java +++ b/packages/url_launcher/url_launcher_macos/example/android/app/src/main/java/io/flutter/plugins/urllauncherexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.urllauncherexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.urllauncher.UrlLauncherPlugin; diff --git a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java index d2498ca8e0c6..b21435f82fde 100644 --- a/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java +++ b/packages/video_player/video_player/example/android/app/src/main/java/io/flutter/plugins/videoplayerexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.videoplayerexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.videoplayer.VideoPlayerPlugin; diff --git a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java index 1e5859af2c47..3a88496594a3 100644 --- a/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java +++ b/packages/webview_flutter/example/android/app/src/main/java/io/flutter/plugins/webviewflutterexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.webviewflutterexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin; From 49bc9a0a31a2d12e2d01dfec3dfccc7257b94748 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 17 Aug 2020 11:34:51 -0700 Subject: [PATCH 18/20] two more missing imports --- .../flutter_plugin_android_lifecycle_example/MainActivity.java | 1 + .../plugins/inapppurchaseexample/EmbeddingV1Activity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java index 7ea28f7edf06..e2d2560e9105 100644 --- a/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java +++ b/packages/flutter_plugin_android_lifecycle/example/android/app/src/main/java/io/flutter/plugins/flutter_plugin_android_lifecycle_example/MainActivity.java @@ -6,6 +6,7 @@ import android.util.Log; import androidx.lifecycle.Lifecycle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.embedding.engine.plugins.FlutterPlugin; diff --git a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java index 803fe6f71685..e157950e5bec 100644 --- a/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java +++ b/packages/in_app_purchase/example/android/app/src/main/java/io/flutter/plugins/inapppurchaseexample/EmbeddingV1Activity.java @@ -5,6 +5,7 @@ package io.flutter.plugins.inapppurchaseexample; import android.os.Bundle; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.app.FlutterActivity; import io.flutter.plugins.inapppurchase.InAppPurchasePlugin; import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin; From cc8fbae57433ff11ff24d1c1903fd519ae0af82a Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 18 Aug 2020 01:32:01 -0700 Subject: [PATCH 19/20] .. --- .../io/flutter/plugins/pathproviderexample/MainActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java index 4664ad89129c..bdecc162446a 100644 --- a/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java +++ b/packages/path_provider/path_provider_macos/example/android/app/src/main/java/io/flutter/plugins/pathproviderexample/MainActivity.java @@ -4,6 +4,7 @@ package io.flutter.plugins.pathproviderexample; +import dev.flutter.plugins.integration_test.IntegrationTestPlugin; import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.engine.FlutterEngine; import io.flutter.plugins.pathprovider.PathProviderPlugin; From ae94bd9a00c94e791402be1c232ffa95236e8cf5 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Wed, 19 Aug 2020 09:50:47 -0700 Subject: [PATCH 20/20] typo --- packages/integration_test/lib/integration_test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/integration_test/lib/integration_test.dart b/packages/integration_test/lib/integration_test.dart index aa53a588f194..6354ef768939 100644 --- a/packages/integration_test/lib/integration_test.dart +++ b/packages/integration_test/lib/integration_test.dart @@ -22,6 +22,7 @@ class IntegrationTestWidgetsFlutterBinding IntegrationTestWidgetsFlutterBinding() { // TODO(jackson): Report test results as they arrive tearDownAll(() async { + print('TESTING123: TEARING HER DOWN'); try { // For web integration tests we are not using the // `plugins.flutter.io/integration_test`. Mark the tests as complete @@ -105,6 +106,7 @@ class IntegrationTestWidgetsFlutterBinding /// Returns an instance of the [IntegrationTestWidgetsFlutterBinding], creating and /// initializing it if necessary. static WidgetsBinding ensureInitialized() { + print('TESTING123 ensuring init'); if (WidgetsBinding.instance == null) { IntegrationTestWidgetsFlutterBinding(); } @@ -113,7 +115,7 @@ class IntegrationTestWidgetsFlutterBinding } static const MethodChannel _channel = - MethodChannel('plugins.flutter.io/integrat_test'); + MethodChannel('plugins.flutter.io/integration_test'); /// Test results that will be populated after the tests have completed. ///