From 10f547e7ed8a83f28beb2d98572de6e7cb60d18f Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 09:24:57 -0700 Subject: [PATCH 01/21] Rename instrumentation_adapter plugin to e2e plugin --- .../{instrumentation_adapter => e2e}/.gitignore | 0 packages/{instrumentation_adapter => e2e}/.metadata | 0 .../{instrumentation_adapter => e2e}/CHANGELOG.md | 5 +++++ packages/{instrumentation_adapter => e2e}/LICENSE | 0 packages/{instrumentation_adapter => e2e}/README.md | 6 +++--- .../android/.gitignore | 0 .../android/build.gradle | 2 +- .../android/gradle.properties | 0 packages/e2e/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 2 +- .../instrumentationadapter/FlutterRunner.java | 0 .../InstrumentationAdapterPlugin.java | 0 .../example/.gitignore | 0 .../example/.metadata | 0 .../example/README.md | 4 ++-- .../example/android/app/build.gradle | 2 +- .../MainActivityTest.java | 2 +- .../android/app/src/debug/AndroidManifest.xml | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 ++-- .../MainActivity.java | 2 +- .../app/src/main/res/drawable/launch_background.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../android/app/src/main/res/values/styles.xml | 0 .../android/app/src/profile/AndroidManifest.xml | 2 +- .../example/android/build.gradle | 0 .../example/android/gradle.properties | 1 + .../gradle/wrapper/gradle-wrapper.properties | 0 .../example/android/settings.gradle | 0 .../example/ios/Flutter/AppFrameworkInfo.plist | 0 .../example/ios/Flutter/Debug.xcconfig | 0 .../example/ios/Flutter/Release.xcconfig | 0 .../example/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 .../AppIcon.appiconset/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 .../AppIcon.appiconset/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 .../Assets.xcassets/LaunchImage.imageset/README.md | 0 .../ios/Runner/Base.lproj/LaunchScreen.storyboard | 0 .../example/ios/Runner/Base.lproj/Main.storyboard | 0 .../example/ios/Runner/Info.plist | 2 +- .../example/ios/Runner/main.m | 0 .../example/lib/main.dart | 0 .../example/pubspec.yaml | 6 +++--- .../example/test/example_e2e.dart} | 4 ++-- .../example/test_driver/example_e2e_test.dart} | 0 .../{instrumentation_adapter => e2e}/ios/.gitignore | 0 .../ios/Assets/.gitkeep | 0 .../ios/Classes/InstrumentationAdapterPlugin.h | 0 .../ios/Classes/InstrumentationAdapterPlugin.m | 0 .../ios/instrumentation_adapter.podspec | 4 ++-- .../lib/e2e.dart} | 0 .../{instrumentation_adapter => e2e}/pubspec.yaml | 6 +++--- .../instrumentation_adapter/android/settings.gradle | 1 - .../instrumentation_adapter/widget_test.dart | 5 ----- 77 files changed, 32 insertions(+), 31 deletions(-) rename packages/{instrumentation_adapter => e2e}/.gitignore (100%) rename packages/{instrumentation_adapter => e2e}/.metadata (100%) rename packages/{instrumentation_adapter => e2e}/CHANGELOG.md (84%) rename packages/{instrumentation_adapter => e2e}/LICENSE (100%) rename packages/{instrumentation_adapter => e2e}/README.md (94%) rename packages/{instrumentation_adapter => e2e}/android/.gitignore (100%) rename packages/{instrumentation_adapter => e2e}/android/build.gradle (94%) rename packages/{instrumentation_adapter => e2e}/android/gradle.properties (100%) create mode 100644 packages/e2e/android/settings.gradle rename packages/{instrumentation_adapter => e2e}/android/src/main/AndroidManifest.xml (62%) rename packages/{instrumentation_adapter => e2e}/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java (100%) rename packages/{instrumentation_adapter => e2e}/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java (100%) rename packages/{instrumentation_adapter => e2e}/example/.gitignore (100%) rename packages/{instrumentation_adapter => e2e}/example/.metadata (100%) rename packages/{instrumentation_adapter => e2e}/example/README.md (84%) rename packages/{instrumentation_adapter => e2e}/example/android/app/build.gradle (96%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java (86%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/debug/AndroidManifest.xml (83%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/AndroidManifest.xml (93%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/java/com/example/instrumentation_adapter_example/MainActivity.java (86%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/drawable/launch_background.xml (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/main/res/values/styles.xml (100%) rename packages/{instrumentation_adapter => e2e}/example/android/app/src/profile/AndroidManifest.xml (83%) rename packages/{instrumentation_adapter => e2e}/example/android/build.gradle (100%) rename packages/{instrumentation_adapter => e2e}/example/android/gradle.properties (79%) rename packages/{instrumentation_adapter => e2e}/example/android/gradle/wrapper/gradle-wrapper.properties (100%) rename packages/{instrumentation_adapter => e2e}/example/android/settings.gradle (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Flutter/AppFrameworkInfo.plist (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Flutter/Debug.xcconfig (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Flutter/Release.xcconfig (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner.xcodeproj/project.pbxproj (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/AppDelegate.h (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/AppDelegate.m (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Base.lproj/Main.storyboard (100%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/Info.plist (96%) rename packages/{instrumentation_adapter => e2e}/example/ios/Runner/main.m (100%) rename packages/{instrumentation_adapter => e2e}/example/lib/main.dart (100%) rename packages/{instrumentation_adapter => e2e}/example/pubspec.yaml (73%) rename packages/{instrumentation_adapter/example/test_driver/widget.dart => e2e/example/test/example_e2e.dart} (88%) rename packages/{instrumentation_adapter/example/test_driver/widget_test.dart => e2e/example/test_driver/example_e2e_test.dart} (100%) rename packages/{instrumentation_adapter => e2e}/ios/.gitignore (100%) rename packages/{instrumentation_adapter => e2e}/ios/Assets/.gitkeep (100%) rename packages/{instrumentation_adapter => e2e}/ios/Classes/InstrumentationAdapterPlugin.h (100%) rename packages/{instrumentation_adapter => e2e}/ios/Classes/InstrumentationAdapterPlugin.m (100%) rename packages/{instrumentation_adapter => e2e}/ios/instrumentation_adapter.podspec (89%) rename packages/{instrumentation_adapter/lib/instrumentation_adapter.dart => e2e/lib/e2e.dart} (100%) rename packages/{instrumentation_adapter => e2e}/pubspec.yaml (85%) delete mode 100644 packages/instrumentation_adapter/android/settings.gradle delete mode 100644 packages/instrumentation_adapter/example/instrumentation_adapter/widget_test.dart diff --git a/packages/instrumentation_adapter/.gitignore b/packages/e2e/.gitignore similarity index 100% rename from packages/instrumentation_adapter/.gitignore rename to packages/e2e/.gitignore diff --git a/packages/instrumentation_adapter/.metadata b/packages/e2e/.metadata similarity index 100% rename from packages/instrumentation_adapter/.metadata rename to packages/e2e/.metadata diff --git a/packages/instrumentation_adapter/CHANGELOG.md b/packages/e2e/CHANGELOG.md similarity index 84% rename from packages/instrumentation_adapter/CHANGELOG.md rename to packages/e2e/CHANGELOG.md index 8b9b8a725a77..e8a5ba2e074a 100644 --- a/packages/instrumentation_adapter/CHANGELOG.md +++ b/packages/e2e/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.2.0 + +* Rename package from instrumentation_adapter to e2e. +* Refactor example app test. + ## 0.1.4 * Migrate example to AndroidX. diff --git a/packages/instrumentation_adapter/LICENSE b/packages/e2e/LICENSE similarity index 100% rename from packages/instrumentation_adapter/LICENSE rename to packages/e2e/LICENSE diff --git a/packages/instrumentation_adapter/README.md b/packages/e2e/README.md similarity index 94% rename from packages/instrumentation_adapter/README.md rename to packages/e2e/README.md index 1063589c615b..6946b44bb18e 100644 --- a/packages/instrumentation_adapter/README.md +++ b/packages/e2e/README.md @@ -1,4 +1,4 @@ -# instrumentation_adapter +# e2e Adapts flutter_test results as Android instrumentation tests, making them usable for Firebase Test Lab and other Android CI providers. @@ -7,7 +7,7 @@ iOS support is not available yet, but is planned in the future. ## Usage -Add a dependency on the `instrumentation_adapter` package in the +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. @@ -15,7 +15,7 @@ Invoke `InstrumentationAdapterFlutterBinding.ensureInitialized()` at the start of a test file, e.g. ```dart -import 'package:instrumentation_adapter/instrumentation_adapter.dart'; +import 'package:e2e/e2e.dart'; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); diff --git a/packages/instrumentation_adapter/android/.gitignore b/packages/e2e/android/.gitignore similarity index 100% rename from packages/instrumentation_adapter/android/.gitignore rename to packages/e2e/android/.gitignore diff --git a/packages/instrumentation_adapter/android/build.gradle b/packages/e2e/android/build.gradle similarity index 94% rename from packages/instrumentation_adapter/android/build.gradle rename to packages/e2e/android/build.gradle index 21c421337428..c91d4721d3ac 100644 --- a/packages/instrumentation_adapter/android/build.gradle +++ b/packages/e2e/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.example.instrumentation_adapter' +group 'com.example.e2e' version '1.0-SNAPSHOT' buildscript { diff --git a/packages/instrumentation_adapter/android/gradle.properties b/packages/e2e/android/gradle.properties similarity index 100% rename from packages/instrumentation_adapter/android/gradle.properties rename to packages/e2e/android/gradle.properties diff --git a/packages/e2e/android/settings.gradle b/packages/e2e/android/settings.gradle new file mode 100644 index 000000000000..e5d17d080b60 --- /dev/null +++ b/packages/e2e/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'e2e' diff --git a/packages/instrumentation_adapter/android/src/main/AndroidManifest.xml b/packages/e2e/android/src/main/AndroidManifest.xml similarity index 62% rename from packages/instrumentation_adapter/android/src/main/AndroidManifest.xml rename to packages/e2e/android/src/main/AndroidManifest.xml index 3b424b6fad67..33fdf86052ab 100644 --- a/packages/instrumentation_adapter/android/src/main/AndroidManifest.xml +++ b/packages/e2e/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="dev.flutter.e2e"> diff --git a/packages/instrumentation_adapter/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java b/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java similarity index 100% rename from packages/instrumentation_adapter/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java rename to packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java diff --git a/packages/instrumentation_adapter/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java b/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java similarity index 100% rename from packages/instrumentation_adapter/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java rename to packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java diff --git a/packages/instrumentation_adapter/example/.gitignore b/packages/e2e/example/.gitignore similarity index 100% rename from packages/instrumentation_adapter/example/.gitignore rename to packages/e2e/example/.gitignore diff --git a/packages/instrumentation_adapter/example/.metadata b/packages/e2e/example/.metadata similarity index 100% rename from packages/instrumentation_adapter/example/.metadata rename to packages/e2e/example/.metadata diff --git a/packages/instrumentation_adapter/example/README.md b/packages/e2e/example/README.md similarity index 84% rename from packages/instrumentation_adapter/example/README.md rename to packages/e2e/example/README.md index f6030a4080b2..64a5e8780bc2 100644 --- a/packages/instrumentation_adapter/example/README.md +++ b/packages/e2e/example/README.md @@ -1,6 +1,6 @@ -# instrumentation_adapter_example +# e2e_example -Demonstrates how to use the instrumentation_adapter plugin. +Demonstrates how to use the e2e plugin. ## Getting Started diff --git a/packages/instrumentation_adapter/example/android/app/build.gradle b/packages/e2e/example/android/app/build.gradle similarity index 96% rename from packages/instrumentation_adapter/example/android/app/build.gradle rename to packages/e2e/example/android/app/build.gradle index 500e9ea951c6..527ed2dd38e0 100644 --- a/packages/instrumentation_adapter/example/android/app/build.gradle +++ b/packages/e2e/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.instrumentation_adapter_example" + applicationId "com.example.e2e_example" minSdkVersion 16 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() diff --git a/packages/instrumentation_adapter/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java b/packages/e2e/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java similarity index 86% rename from packages/instrumentation_adapter/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java rename to packages/e2e/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java index bb489bf57942..11a6c6afb2fa 100644 --- a/packages/instrumentation_adapter/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java +++ b/packages/e2e/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java @@ -1,4 +1,4 @@ -package com.example.instrumentation_adapter_example; +package com.example.e2e_example; import androidx.test.rule.ActivityTestRule; import dev.flutter.plugins.instrumentationadapter.FlutterRunner; diff --git a/packages/instrumentation_adapter/example/android/app/src/debug/AndroidManifest.xml b/packages/e2e/example/android/app/src/debug/AndroidManifest.xml similarity index 83% rename from packages/instrumentation_adapter/example/android/app/src/debug/AndroidManifest.xml rename to packages/e2e/example/android/app/src/debug/AndroidManifest.xml index 87cc33d27c03..5d4aea26b1dd 100644 --- a/packages/instrumentation_adapter/example/android/app/src/debug/AndroidManifest.xml +++ b/packages/e2e/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.e2e_example"> diff --git a/packages/instrumentation_adapter/example/android/app/src/main/AndroidManifest.xml b/packages/e2e/example/android/app/src/main/AndroidManifest.xml similarity index 93% rename from packages/instrumentation_adapter/example/android/app/src/main/AndroidManifest.xml rename to packages/e2e/example/android/app/src/main/AndroidManifest.xml index 653fa39a669d..d2477d5977f5 100644 --- a/packages/instrumentation_adapter/example/android/app/src/main/AndroidManifest.xml +++ b/packages/e2e/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.e2e_example"> + package="com.example.e2e_example"> diff --git a/packages/instrumentation_adapter/example/android/build.gradle b/packages/e2e/example/android/build.gradle similarity index 100% rename from packages/instrumentation_adapter/example/android/build.gradle rename to packages/e2e/example/android/build.gradle diff --git a/packages/instrumentation_adapter/example/android/gradle.properties b/packages/e2e/example/android/gradle.properties similarity index 79% rename from packages/instrumentation_adapter/example/android/gradle.properties rename to packages/e2e/example/android/gradle.properties index 755300e3a0b5..1515360c4bce 100644 --- a/packages/instrumentation_adapter/example/android/gradle.properties +++ b/packages/e2e/example/android/gradle.properties @@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.enableR8=true diff --git a/packages/instrumentation_adapter/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/e2e/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/instrumentation_adapter/example/android/gradle/wrapper/gradle-wrapper.properties rename to packages/e2e/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/instrumentation_adapter/example/android/settings.gradle b/packages/e2e/example/android/settings.gradle similarity index 100% rename from packages/instrumentation_adapter/example/android/settings.gradle rename to packages/e2e/example/android/settings.gradle diff --git a/packages/instrumentation_adapter/example/ios/Flutter/AppFrameworkInfo.plist b/packages/e2e/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from packages/instrumentation_adapter/example/ios/Flutter/AppFrameworkInfo.plist rename to packages/e2e/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/packages/instrumentation_adapter/example/ios/Flutter/Debug.xcconfig b/packages/e2e/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from packages/instrumentation_adapter/example/ios/Flutter/Debug.xcconfig rename to packages/e2e/example/ios/Flutter/Debug.xcconfig diff --git a/packages/instrumentation_adapter/example/ios/Flutter/Release.xcconfig b/packages/e2e/example/ios/Flutter/Release.xcconfig similarity index 100% rename from packages/instrumentation_adapter/example/ios/Flutter/Release.xcconfig rename to packages/e2e/example/ios/Flutter/Release.xcconfig diff --git a/packages/instrumentation_adapter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/e2e/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner.xcodeproj/project.pbxproj rename to packages/e2e/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/packages/instrumentation_adapter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/e2e/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/e2e/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/packages/instrumentation_adapter/example/ios/Runner/AppDelegate.h b/packages/e2e/example/ios/Runner/AppDelegate.h similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/AppDelegate.h rename to packages/e2e/example/ios/Runner/AppDelegate.h diff --git a/packages/instrumentation_adapter/example/ios/Runner/AppDelegate.m b/packages/e2e/example/ios/Runner/AppDelegate.m similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/AppDelegate.m rename to packages/e2e/example/ios/Runner/AppDelegate.m diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/e2e/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/packages/instrumentation_adapter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/e2e/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/e2e/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/packages/instrumentation_adapter/example/ios/Runner/Base.lproj/Main.storyboard b/packages/e2e/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/Base.lproj/Main.storyboard rename to packages/e2e/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/packages/instrumentation_adapter/example/ios/Runner/Info.plist b/packages/e2e/example/ios/Runner/Info.plist similarity index 96% rename from packages/instrumentation_adapter/example/ios/Runner/Info.plist rename to packages/e2e/example/ios/Runner/Info.plist index 613203aaeb06..62f6fbb5c02c 100644 --- a/packages/instrumentation_adapter/example/ios/Runner/Info.plist +++ b/packages/e2e/example/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - instrumentation_adapter_example + e2e_example CFBundlePackageType APPL CFBundleShortVersionString diff --git a/packages/instrumentation_adapter/example/ios/Runner/main.m b/packages/e2e/example/ios/Runner/main.m similarity index 100% rename from packages/instrumentation_adapter/example/ios/Runner/main.m rename to packages/e2e/example/ios/Runner/main.m diff --git a/packages/instrumentation_adapter/example/lib/main.dart b/packages/e2e/example/lib/main.dart similarity index 100% rename from packages/instrumentation_adapter/example/lib/main.dart rename to packages/e2e/example/lib/main.dart diff --git a/packages/instrumentation_adapter/example/pubspec.yaml b/packages/e2e/example/pubspec.yaml similarity index 73% rename from packages/instrumentation_adapter/example/pubspec.yaml rename to packages/e2e/example/pubspec.yaml index 55d547736b24..3538bb65db0f 100644 --- a/packages/instrumentation_adapter/example/pubspec.yaml +++ b/packages/e2e/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: instrumentation_adapter_example -description: Demonstrates how to use the instrumentation_adapter plugin. +name: e2e_example +description: Demonstrates how to use the e2e plugin. publish_to: 'none' environment: @@ -16,7 +16,7 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - instrumentation_adapter: + e2e: path: ../ # For information on the generic Dart part of this file, see the diff --git a/packages/instrumentation_adapter/example/test_driver/widget.dart b/packages/e2e/example/test/example_e2e.dart similarity index 88% rename from packages/instrumentation_adapter/example/test_driver/widget.dart rename to packages/e2e/example/test/example_e2e.dart index 109002c86790..92c8b17e78ec 100644 --- a/packages/instrumentation_adapter/example/test_driver/widget.dart +++ b/packages/e2e/example/test/example_e2e.dart @@ -8,9 +8,9 @@ import 'dart:io' show Platform; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:instrumentation_adapter/instrumentation_adapter.dart'; +import 'package:e2e/e2e.dart'; -import 'package:instrumentation_adapter_example/main.dart'; +import 'package:e2e_example/main.dart'; void main() { InstrumentationAdapterFlutterBinding.ensureInitialized(); diff --git a/packages/instrumentation_adapter/example/test_driver/widget_test.dart b/packages/e2e/example/test_driver/example_e2e_test.dart similarity index 100% rename from packages/instrumentation_adapter/example/test_driver/widget_test.dart rename to packages/e2e/example/test_driver/example_e2e_test.dart diff --git a/packages/instrumentation_adapter/ios/.gitignore b/packages/e2e/ios/.gitignore similarity index 100% rename from packages/instrumentation_adapter/ios/.gitignore rename to packages/e2e/ios/.gitignore diff --git a/packages/instrumentation_adapter/ios/Assets/.gitkeep b/packages/e2e/ios/Assets/.gitkeep similarity index 100% rename from packages/instrumentation_adapter/ios/Assets/.gitkeep rename to packages/e2e/ios/Assets/.gitkeep diff --git a/packages/instrumentation_adapter/ios/Classes/InstrumentationAdapterPlugin.h b/packages/e2e/ios/Classes/InstrumentationAdapterPlugin.h similarity index 100% rename from packages/instrumentation_adapter/ios/Classes/InstrumentationAdapterPlugin.h rename to packages/e2e/ios/Classes/InstrumentationAdapterPlugin.h diff --git a/packages/instrumentation_adapter/ios/Classes/InstrumentationAdapterPlugin.m b/packages/e2e/ios/Classes/InstrumentationAdapterPlugin.m similarity index 100% rename from packages/instrumentation_adapter/ios/Classes/InstrumentationAdapterPlugin.m rename to packages/e2e/ios/Classes/InstrumentationAdapterPlugin.m diff --git a/packages/instrumentation_adapter/ios/instrumentation_adapter.podspec b/packages/e2e/ios/instrumentation_adapter.podspec similarity index 89% rename from packages/instrumentation_adapter/ios/instrumentation_adapter.podspec rename to packages/e2e/ios/instrumentation_adapter.podspec index 45edadad4cab..e96473221e45 100644 --- a/packages/instrumentation_adapter/ios/instrumentation_adapter.podspec +++ b/packages/e2e/ios/instrumentation_adapter.podspec @@ -2,13 +2,13 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'instrumentation_adapter' + s.name = 'e2e' s.version = '0.0.1' s.summary = 'Instrumentation adapter.' 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/instrumentation_adapter' + s.homepage = 'https://github.com/flutter/plugins/tree/master/packages/e2e' s.license = { :file => '../LICENSE' } s.author = { 'Flutter Team' => 'flutter-dev@googlegroups.com' } s.source = { :path => '.' } diff --git a/packages/instrumentation_adapter/lib/instrumentation_adapter.dart b/packages/e2e/lib/e2e.dart similarity index 100% rename from packages/instrumentation_adapter/lib/instrumentation_adapter.dart rename to packages/e2e/lib/e2e.dart diff --git a/packages/instrumentation_adapter/pubspec.yaml b/packages/e2e/pubspec.yaml similarity index 85% rename from packages/instrumentation_adapter/pubspec.yaml rename to packages/e2e/pubspec.yaml index 1d8c258d8097..da9feb66ae6f 100644 --- a/packages/instrumentation_adapter/pubspec.yaml +++ b/packages/e2e/pubspec.yaml @@ -1,8 +1,8 @@ -name: instrumentation_adapter +name: e2e description: Runs tests that use the flutter_test API as integration tests. -version: 0.1.4 +version: 0.1.5 author: Flutter Team -homepage: https://github.com/flutter/plugins/tree/master/packages/instrumentation_adapter +homepage: https://github.com/flutter/plugins/tree/master/packages/e2e environment: sdk: ">=2.1.0 <3.0.0" diff --git a/packages/instrumentation_adapter/android/settings.gradle b/packages/instrumentation_adapter/android/settings.gradle deleted file mode 100644 index ed03d0eb2a5e..000000000000 --- a/packages/instrumentation_adapter/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'instrumentation_adapter' diff --git a/packages/instrumentation_adapter/example/instrumentation_adapter/widget_test.dart b/packages/instrumentation_adapter/example/instrumentation_adapter/widget_test.dart deleted file mode 100644 index 9829553c6522..000000000000 --- a/packages/instrumentation_adapter/example/instrumentation_adapter/widget_test.dart +++ /dev/null @@ -1,5 +0,0 @@ -import '../test_driver/widget.dart' as test; - -void main() { - test.main(); -} From 0fd2ce2abe53ef336d8fcfcf5e235ed183e252da Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 09:50:07 -0700 Subject: [PATCH 02/21] Move test --- packages/e2e/example/{test => test_driver}/example_e2e.dart | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/e2e/example/{test => test_driver}/example_e2e.dart (100%) diff --git a/packages/e2e/example/test/example_e2e.dart b/packages/e2e/example/test_driver/example_e2e.dart similarity index 100% rename from packages/e2e/example/test/example_e2e.dart rename to packages/e2e/example/test_driver/example_e2e.dart From d591fbe15e17e06ca19b730e65e4acea14f17883 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 09:51:23 -0700 Subject: [PATCH 03/21] rename binding --- packages/e2e/example/test_driver/example_e2e.dart | 2 +- packages/e2e/lib/e2e.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e/example/test_driver/example_e2e.dart b/packages/e2e/example/test_driver/example_e2e.dart index 92c8b17e78ec..e91dd4d0ce9f 100644 --- a/packages/e2e/example/test_driver/example_e2e.dart +++ b/packages/e2e/example/test_driver/example_e2e.dart @@ -13,7 +13,7 @@ import 'package:e2e/e2e.dart'; import 'package:e2e_example/main.dart'; void main() { - InstrumentationAdapterFlutterBinding.ensureInitialized(); + E2EWidgetsFlutterBinding.ensureInitialized(); testWidgets('verify text', (WidgetTester tester) async { // Build our app and trigger a frame. await tester.pumpWidget(MyApp()); diff --git a/packages/e2e/lib/e2e.dart b/packages/e2e/lib/e2e.dart index 9999452234cd..22209edd9c1e 100644 --- a/packages/e2e/lib/e2e.dart +++ b/packages/e2e/lib/e2e.dart @@ -10,9 +10,9 @@ import 'package:flutter/widgets.dart'; /// A subclass of [LiveTestWidgetsFlutterBinding] that reports tests results /// on a channel to adapt them to native instrumentation test format. -class InstrumentationAdapterFlutterBinding +class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { - InstrumentationAdapterFlutterBinding() { + E2EWidgetsFlutterBinding() { // TODO(jackson): Report test results as they arrive tearDownAll(() async { try { From 78e7618b8e4d7045a6c2f807f1f1aedeeaba5f1a Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 10:27:54 -0700 Subject: [PATCH 04/21] Update changelog --- packages/e2e/CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/e2e/CHANGELOG.md b/packages/e2e/CHANGELOG.md index e8a5ba2e074a..a1ec8f21a48d 100644 --- a/packages/e2e/CHANGELOG.md +++ b/packages/e2e/CHANGELOG.md @@ -1,7 +1,9 @@ ## 0.2.0 -* Rename package from instrumentation_adapter to e2e. -* Refactor example app test. +* Renamed package from instrumentation_adapter to e2e. +* Refactored example app test. +* **Breaking change**. Renamed `InstrumentationAdapterFlutterBinding` to + `E2EWidgetsFlutterBinding`. ## 0.1.4 From 11432a4ad34c7ea88a126f39d858959aed6432fc Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 10:29:02 -0700 Subject: [PATCH 05/21] Fix analyze error --- packages/e2e/lib/e2e.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e2e/lib/e2e.dart b/packages/e2e/lib/e2e.dart index 22209edd9c1e..5ac717de18f8 100644 --- a/packages/e2e/lib/e2e.dart +++ b/packages/e2e/lib/e2e.dart @@ -29,9 +29,9 @@ class E2EWidgetsFlutterBinding static WidgetsBinding ensureInitialized() { if (WidgetsBinding.instance == null) { - InstrumentationAdapterFlutterBinding(); + E2EWidgetsFlutterBinding(); } - assert(WidgetsBinding.instance is InstrumentationAdapterFlutterBinding); + assert(WidgetsBinding.instance is E2EWidgetsFlutterBinding); return WidgetsBinding.instance; } From 2872f031bbaa7cbe753ac651ecf2d998d07d24ea Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 11:12:04 -0700 Subject: [PATCH 06/21] More renaming --- .../e2e/E2EPlugin.java} | 6 +++--- .../e2e}/FlutterRunner.java | 2 +- .../MainActivityTest.java | 0 .../MainActivity.java | 0 .../ios/{instrumentation_adapter.podspec => e2e.podspec} | 0 packages/e2e/pubspec.yaml | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename packages/e2e/android/src/main/java/dev/flutter/{instrumentationadapter/InstrumentationAdapterPlugin.java => plugins/e2e/E2EPlugin.java} (88%) rename packages/e2e/android/src/main/java/dev/flutter/{instrumentationadapter => plugins/e2e}/FlutterRunner.java (97%) rename packages/e2e/example/android/app/src/androidTest/java/com/example/{instrumentation_adapter_example => e2e_example}/MainActivityTest.java (100%) rename packages/e2e/example/android/app/src/main/java/com/example/{instrumentation_adapter_example => e2e_example}/MainActivity.java (100%) rename packages/e2e/ios/{instrumentation_adapter.podspec => e2e.podspec} (100%) diff --git a/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java similarity index 88% rename from packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java rename to packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java index c77a94e89f91..a095f6804585 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/InstrumentationAdapterPlugin.java +++ b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.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.instrumentationadapter; +package dev.flutter.plugins.e2e; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; @@ -12,8 +12,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -/** InstrumentationAdapterPlugin */ -public class InstrumentationAdapterPlugin implements MethodCallHandler { +/** E2EPlugin */ +public class E2EPlugin implements MethodCallHandler { public static CompletableFuture> testResults = new CompletableFuture<>(); diff --git a/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java similarity index 97% rename from packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java rename to packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java index c823306e022c..5d155c9c8063 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/instrumentationadapter/FlutterRunner.java +++ b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.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.instrumentationadapter; +package dev.flutter.plugins.e2e; import android.app.Activity; import androidx.test.rule.ActivityTestRule; diff --git a/packages/e2e/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java b/packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/MainActivityTest.java similarity index 100% rename from packages/e2e/example/android/app/src/androidTest/java/com/example/instrumentation_adapter_example/MainActivityTest.java rename to packages/e2e/example/android/app/src/androidTest/java/com/example/e2e_example/MainActivityTest.java diff --git a/packages/e2e/example/android/app/src/main/java/com/example/instrumentation_adapter_example/MainActivity.java b/packages/e2e/example/android/app/src/main/java/com/example/e2e_example/MainActivity.java similarity index 100% rename from packages/e2e/example/android/app/src/main/java/com/example/instrumentation_adapter_example/MainActivity.java rename to packages/e2e/example/android/app/src/main/java/com/example/e2e_example/MainActivity.java diff --git a/packages/e2e/ios/instrumentation_adapter.podspec b/packages/e2e/ios/e2e.podspec similarity index 100% rename from packages/e2e/ios/instrumentation_adapter.podspec rename to packages/e2e/ios/e2e.podspec diff --git a/packages/e2e/pubspec.yaml b/packages/e2e/pubspec.yaml index da9feb66ae6f..694575809e73 100644 --- a/packages/e2e/pubspec.yaml +++ b/packages/e2e/pubspec.yaml @@ -15,5 +15,5 @@ dependencies: flutter: plugin: - androidPackage: dev.flutter.plugins.instrumentationadapter - pluginClass: InstrumentationAdapterPlugin + androidPackage: dev.flutter.plugins.e2e + pluginClass: E2EPlugin From 19336c905775aefc36c29ef5840523675881a9cf Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 11:35:31 -0700 Subject: [PATCH 07/21] Fix compile errors, pod spec --- .../src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java | 2 +- .../src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java | 2 +- packages/e2e/ios/e2e.podspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java index a095f6804585..7512ba176104 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java +++ b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java @@ -22,7 +22,7 @@ public class E2EPlugin implements MethodCallHandler { /** Plugin registration. */ public static void registerWith(Registrar registrar) { final MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL); - channel.setMethodCallHandler(new InstrumentationAdapterPlugin()); + channel.setMethodCallHandler(new E2EPlugin()); } @Override diff --git a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java index 5d155c9c8063..31f3e8431cad 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java +++ b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/FlutterRunner.java @@ -49,7 +49,7 @@ public Description getDescription() { public void run(RunNotifier notifier) { Map results = null; try { - results = InstrumentationAdapterPlugin.testResults.get(); + results = E2EPlugin.testResults.get(); } catch (ExecutionException | InterruptedException e) { throw new IllegalThreadStateException("Unable to get test results"); } diff --git a/packages/e2e/ios/e2e.podspec b/packages/e2e/ios/e2e.podspec index e96473221e45..cb0f3bcc4088 100644 --- a/packages/e2e/ios/e2e.podspec +++ b/packages/e2e/ios/e2e.podspec @@ -4,7 +4,7 @@ Pod::Spec.new do |s| s.name = 'e2e' s.version = '0.0.1' - s.summary = 'Instrumentation adapter.' + s.summary = 'Adapter for e2e tests.' s.description = <<-DESC Runs tests that use the flutter_test API as integration tests. DESC From 2fee99021f9498192d96c5515a34f1c8b845cddd Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 11:36:20 -0700 Subject: [PATCH 08/21] Update pubspec --- packages/e2e/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e/pubspec.yaml b/packages/e2e/pubspec.yaml index 694575809e73..6e8bab883d91 100644 --- a/packages/e2e/pubspec.yaml +++ b/packages/e2e/pubspec.yaml @@ -1,6 +1,6 @@ name: e2e description: Runs tests that use the flutter_test API as integration tests. -version: 0.1.5 +version: 0.2.0 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/e2e From d247cced50c01371331f28163bffbffbbe790def Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 11:36:52 -0700 Subject: [PATCH 09/21] reformat --- packages/e2e/lib/e2e.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/e2e/lib/e2e.dart b/packages/e2e/lib/e2e.dart index 5ac717de18f8..66c2fda9aad8 100644 --- a/packages/e2e/lib/e2e.dart +++ b/packages/e2e/lib/e2e.dart @@ -10,8 +10,7 @@ import 'package:flutter/widgets.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 E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { E2EWidgetsFlutterBinding() { // TODO(jackson): Report test results as they arrive tearDownAll(() async { From 25b157e2df37476801e26f8e669acb1c877ed321 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 13:36:38 -0700 Subject: [PATCH 10/21] Fix iOS build --- .../ios/Classes/{InstrumentationAdapterPlugin.h => E2EPlugin.h} | 0 .../ios/Classes/{InstrumentationAdapterPlugin.m => E2EPlugin.m} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename packages/e2e/ios/Classes/{InstrumentationAdapterPlugin.h => E2EPlugin.h} (100%) rename packages/e2e/ios/Classes/{InstrumentationAdapterPlugin.m => E2EPlugin.m} (100%) diff --git a/packages/e2e/ios/Classes/InstrumentationAdapterPlugin.h b/packages/e2e/ios/Classes/E2EPlugin.h similarity index 100% rename from packages/e2e/ios/Classes/InstrumentationAdapterPlugin.h rename to packages/e2e/ios/Classes/E2EPlugin.h diff --git a/packages/e2e/ios/Classes/InstrumentationAdapterPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m similarity index 100% rename from packages/e2e/ios/Classes/InstrumentationAdapterPlugin.m rename to packages/e2e/ios/Classes/E2EPlugin.m From 3fb0d7c443e716c78948dc1aaf85d6d34a36c506 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 13:56:49 -0700 Subject: [PATCH 11/21] Rename iOS plugin classes --- packages/e2e/ios/Classes/E2EPlugin.h | 2 +- packages/e2e/ios/Classes/E2EPlugin.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e/ios/Classes/E2EPlugin.h b/packages/e2e/ios/Classes/E2EPlugin.h index 3d92ba91bf34..1411dce3f1da 100644 --- a/packages/e2e/ios/Classes/E2EPlugin.h +++ b/packages/e2e/ios/Classes/E2EPlugin.h @@ -1,4 +1,4 @@ #import -@interface InstrumentationAdapterPlugin : NSObject +@interface E2EPlugin : NSObject @end diff --git a/packages/e2e/ios/Classes/E2EPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m index 704a5b05e031..fbf00ed01675 100644 --- a/packages/e2e/ios/Classes/E2EPlugin.m +++ b/packages/e2e/ios/Classes/E2EPlugin.m @@ -1,6 +1,6 @@ -#import "InstrumentationAdapterPlugin.h" +#import "E2EPlugin.h" -@implementation InstrumentationAdapterPlugin +@implementation E2EPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = [FlutterMethodChannel methodChannelWithName:@"dev.flutter/InstrumentationAdapterFlutterBinding" From fb7b4de9b3330305ec9d5c55b9d1f0b4b693ee6c Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 14:10:28 -0700 Subject: [PATCH 12/21] Update README --- packages/e2e/README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/e2e/README.md b/packages/e2e/README.md index 6946b44bb18e..7fd15f392878 100644 --- a/packages/e2e/README.md +++ b/packages/e2e/README.md @@ -34,7 +34,7 @@ this test file MainActivityTest.java or another name of your choice. package com.example.myapp; import androidx.test.rule.ActivityTestRule; -import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import dev.flutter.plugins.e2e.FlutterRunner; import org.junit.Rule; import org.junit.runner.RunWith; @@ -67,6 +67,28 @@ dependencies { } ``` +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 ../test/_e2e.dart +``` + +To e2e test on a local emulator using Android instrumentation: + +``` +./gradlew connectedAndroidTest -Ptarget=`pwd`/../test_driver/_e2e.dart +``` + +To e2e test using Firebase test lab, follow the instructions on the [e2e README](https://github.com/flutter/plugins/tree/master/packages/e2e) or let CI do it for you. + Use gradle commands to build an instrumentation test for Android. ``` From 5f85de240d2fc8b165426972f72c8aeabebea336 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 14:31:19 -0700 Subject: [PATCH 13/21] Readme updates --- packages/e2e/README.md | 58 +++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/packages/e2e/README.md b/packages/e2e/README.md index 7fd15f392878..1e250dd2dec4 100644 --- a/packages/e2e/README.md +++ b/packages/e2e/README.md @@ -22,9 +22,43 @@ void main() { testWidgets("failing test example", (WidgetTester tester) async { expect(2 + 2, equals(5)); }); + exit(result == 'pass' ? 0 : 1); +} +``` + +## 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 `_test.dart` in the app' `test_driver` directory: + +``` +import 'package:flutter_driver/flutter_driver.dart'; + +Future main() async { + final FlutterDriver driver = await FlutterDriver.connect(); + await driver.requestData(null, timeout: const Duration(minutes: 1)); + driver.close(); } ``` +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 +``` + +## 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 @@ -67,29 +101,16 @@ dependencies { } ``` -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 ../test/_e2e.dart -``` - -To e2e test on a local emulator using Android instrumentation: +To e2e test on a local Android device (emulated or physical): ``` ./gradlew connectedAndroidTest -Ptarget=`pwd`/../test_driver/_e2e.dart ``` -To e2e test using Firebase test lab, follow the instructions on the [e2e README](https://github.com/flutter/plugins/tree/master/packages/e2e) or let CI do it for you. +## Firebase Test Lab -Use gradle commands to build an instrumentation test for Android. +To run an e2e test on Android devices using Firebase Test Lab, use gradle commands to build an +instrumentation test for Android. ``` pushd android @@ -112,6 +133,8 @@ gcloud firebase test android run --type instrumentation \ --results-dir= ``` +iOS support for Firebase Test Lab is not yet available, but is planned. + ## Flutter driver support `InstrumentationAdapterFlutterBinding` also reports test results to `FlutterDriver` @@ -121,5 +144,4 @@ when run on the command line via `flutter drive`. final FlutterDriver driver = await FlutterDriver.connect(); final String result = await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); - exit(result == 'pass' ? 0 : 1); ``` From f22d64ddd6ab873f153c31bdc7e786c98419a72d Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 14:38:51 -0700 Subject: [PATCH 14/21] Rename channel --- .../src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java | 2 +- packages/e2e/ios/Classes/E2EPlugin.m | 2 +- packages/e2e/lib/e2e.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java index 7512ba176104..bbb8d8bb4479 100644 --- a/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java +++ b/packages/e2e/android/src/main/java/dev/flutter/plugins/e2e/E2EPlugin.java @@ -17,7 +17,7 @@ public class E2EPlugin implements MethodCallHandler { public static CompletableFuture> testResults = new CompletableFuture<>(); - private static final String CHANNEL = "dev.flutter/InstrumentationAdapterFlutterBinding"; + private static final String CHANNEL = "plugins.flutter.dev/e2e"; /** Plugin registration. */ public static void registerWith(Registrar registrar) { diff --git a/packages/e2e/ios/Classes/E2EPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m index fbf00ed01675..ff8282ba22e0 100644 --- a/packages/e2e/ios/Classes/E2EPlugin.m +++ b/packages/e2e/ios/Classes/E2EPlugin.m @@ -3,7 +3,7 @@ @implementation E2EPlugin + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = [FlutterMethodChannel - methodChannelWithName:@"dev.flutter/InstrumentationAdapterFlutterBinding" + methodChannelWithName:@"plugins.flutter.dev/e2e" binaryMessenger:[registrar messenger]]; InstrumentationAdapterPlugin* instance = [[InstrumentationAdapterPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; diff --git a/packages/e2e/lib/e2e.dart b/packages/e2e/lib/e2e.dart index 66c2fda9aad8..00d29633d045 100644 --- a/packages/e2e/lib/e2e.dart +++ b/packages/e2e/lib/e2e.dart @@ -35,7 +35,7 @@ class E2EWidgetsFlutterBinding extends LiveTestWidgetsFlutterBinding { } static const MethodChannel _channel = - MethodChannel('dev.flutter/InstrumentationAdapterFlutterBinding'); + MethodChannel('plugins.flutter.dev/e2e'); static Map _results = {}; From 3604c790148e5804816bc284014326a626003ecc Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 14:49:29 -0700 Subject: [PATCH 15/21] reformat --- packages/e2e/ios/Classes/E2EPlugin.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e/ios/Classes/E2EPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m index ff8282ba22e0..2de6c5de75bf 100644 --- a/packages/e2e/ios/Classes/E2EPlugin.m +++ b/packages/e2e/ios/Classes/E2EPlugin.m @@ -2,9 +2,9 @@ @implementation E2EPlugin + (void)registerWithRegistrar:(NSObject*)registrar { - FlutterMethodChannel* channel = [FlutterMethodChannel - methodChannelWithName:@"plugins.flutter.dev/e2e" - binaryMessenger:[registrar messenger]]; + FlutterMethodChannel* channel = + [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.dev/e2e" + binaryMessenger:[registrar messenger]]; InstrumentationAdapterPlugin* instance = [[InstrumentationAdapterPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; } From 6a58fffd407faa100222ab7166f7d4db513154c2 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:05:48 -0700 Subject: [PATCH 16/21] Demonstrate reading the exit code --- packages/e2e/README.md | 1 + packages/e2e/example/test_driver/example_e2e_test.dart | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/e2e/README.md b/packages/e2e/README.md index 1e250dd2dec4..43a81f230b8f 100644 --- a/packages/e2e/README.md +++ b/packages/e2e/README.md @@ -40,6 +40,7 @@ Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); + exit(result == 'pass' ? 0 : 1); } ``` diff --git a/packages/e2e/example/test_driver/example_e2e_test.dart b/packages/e2e/example/test_driver/example_e2e_test.dart index 88e53d1c1f05..d3ff49bf6057 100644 --- a/packages/e2e/example/test_driver/example_e2e_test.dart +++ b/packages/e2e/example/test_driver/example_e2e_test.dart @@ -6,4 +6,5 @@ Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); + exit(result == 'pass' ? 0 : 1); } From b690d0b5e48ce5a73983cd221041fec0f1390c82 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:14:38 -0700 Subject: [PATCH 17/21] Report result to command linea --- packages/e2e/example/test_driver/example_e2e_test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/e2e/example/test_driver/example_e2e_test.dart b/packages/e2e/example/test_driver/example_e2e_test.dart index d3ff49bf6057..bd5239680bbe 100644 --- a/packages/e2e/example/test_driver/example_e2e_test.dart +++ b/packages/e2e/example/test_driver/example_e2e_test.dart @@ -1,10 +1,12 @@ import 'dart:async'; +import 'dart:io'; import 'package:flutter_driver/flutter_driver.dart'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); - await driver.requestData(null, timeout: const Duration(minutes: 1)); + String result = + await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); exit(result == 'pass' ? 0 : 1); } From a628e8a023f297fae65a7fed136b6a5d5f3faee8 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:16:23 -0700 Subject: [PATCH 18/21] Remove obsolete README section --- packages/e2e/README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packages/e2e/README.md b/packages/e2e/README.md index 43a81f230b8f..9b1dab18a2d5 100644 --- a/packages/e2e/README.md +++ b/packages/e2e/README.md @@ -135,14 +135,3 @@ gcloud firebase test android run --type instrumentation \ ``` iOS support for Firebase Test Lab is not yet available, but is planned. - -## Flutter driver support - -`InstrumentationAdapterFlutterBinding` also reports test results to `FlutterDriver` -when run on the command line via `flutter drive`. - -```dart - final FlutterDriver driver = await FlutterDriver.connect(); - final String result = await driver.requestData(null, timeout: const Duration(minutes: 1)); - driver.close(); -``` From 915835ab54d81b4381eaa4ef2b970c5693e0e550 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 15:32:26 -0700 Subject: [PATCH 19/21] e2e test analyzer failure --- packages/e2e/example/test_driver/example_e2e_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e/example/test_driver/example_e2e_test.dart b/packages/e2e/example/test_driver/example_e2e_test.dart index bd5239680bbe..4f38746ce76c 100644 --- a/packages/e2e/example/test_driver/example_e2e_test.dart +++ b/packages/e2e/example/test_driver/example_e2e_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_driver/flutter_driver.dart'; Future main() async { final FlutterDriver driver = await FlutterDriver.connect(); - String result = + final String result = await driver.requestData(null, timeout: const Duration(minutes: 1)); driver.close(); exit(result == 'pass' ? 0 : 1); From 69725c5fa897dd61c7e7a9f1174b35d46a813d31 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 16:16:32 -0700 Subject: [PATCH 20/21] rename iOS call --- packages/e2e/ios/Classes/E2EPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e/ios/Classes/E2EPlugin.m b/packages/e2e/ios/Classes/E2EPlugin.m index 2de6c5de75bf..4f19f3a2f961 100644 --- a/packages/e2e/ios/Classes/E2EPlugin.m +++ b/packages/e2e/ios/Classes/E2EPlugin.m @@ -5,7 +5,7 @@ + (void)registerWithRegistrar:(NSObject*)registrar { FlutterMethodChannel* channel = [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.dev/e2e" binaryMessenger:[registrar messenger]]; - InstrumentationAdapterPlugin* instance = [[InstrumentationAdapterPlugin alloc] init]; + E2EPlugin* instance = [[E2EPlugin alloc] init]; [registrar addMethodCallDelegate:instance channel:channel]; } From 8a882f6dd91b261f97ac0ef2f389800817092908 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Mon, 7 Oct 2019 17:07:00 -0700 Subject: [PATCH 21/21] update README to CHANGELOG --- packages/e2e/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/e2e/CHANGELOG.md b/packages/e2e/CHANGELOG.md index a1ec8f21a48d..44ec042e8066 100644 --- a/packages/e2e/CHANGELOG.md +++ b/packages/e2e/CHANGELOG.md @@ -4,6 +4,7 @@ * Refactored example app test. * **Breaking change**. Renamed `InstrumentationAdapterFlutterBinding` to `E2EWidgetsFlutterBinding`. +* Updated README. ## 0.1.4