From e650379c75b371fe6611d9ca6bde20237e5788b3 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 27 Aug 2019 13:58:43 -0700 Subject: [PATCH 1/5] Update instrumentation_adapter for release --- packages/instrumentation_adapter/CHANGELOG.md | 4 ++++ packages/instrumentation_adapter/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/instrumentation_adapter/CHANGELOG.md b/packages/instrumentation_adapter/CHANGELOG.md index 29f648fd17f1..75f79ef03835 100644 --- a/packages/instrumentation_adapter/CHANGELOG.md +++ b/packages/instrumentation_adapter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.2 + +* Initial release in first-party plugins repository. + ## 0.0.1 * Initial release diff --git a/packages/instrumentation_adapter/pubspec.yaml b/packages/instrumentation_adapter/pubspec.yaml index 103a43628024..693ad090f5e1 100644 --- a/packages/instrumentation_adapter/pubspec.yaml +++ b/packages/instrumentation_adapter/pubspec.yaml @@ -1,6 +1,6 @@ name: instrumentation_adapter description: Runs tests that use the flutter_test API as platform native instrumentation tests. -version: 0.0.1 +version: 0.0.2 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/instrumentation_adapter @@ -16,4 +16,4 @@ dependencies: flutter: plugin: androidPackage: dev.flutter.plugins.instrumentationadapter - pluginClass: InstrumentationAdapterPlugin \ No newline at end of file + pluginClass: InstrumentationAdapterPlugin From 17878a39461bccc9548a21aef95cb0c97a67462c Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 27 Aug 2019 14:04:28 -0700 Subject: [PATCH 2/5] Update docs --- packages/instrumentation_adapter/CHANGELOG.md | 2 +- packages/instrumentation_adapter/README.md | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/instrumentation_adapter/CHANGELOG.md b/packages/instrumentation_adapter/CHANGELOG.md index 75f79ef03835..d5326e512537 100644 --- a/packages/instrumentation_adapter/CHANGELOG.md +++ b/packages/instrumentation_adapter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.0.2 -* Initial release in first-party plugins repository. +* Document current usage instructions, which require adding a Java test file. ## 0.0.1 diff --git a/packages/instrumentation_adapter/README.md b/packages/instrumentation_adapter/README.md index b2a65bd84a46..72f87a2d663f 100644 --- a/packages/instrumentation_adapter/README.md +++ b/packages/instrumentation_adapter/README.md @@ -22,6 +22,26 @@ void main() { } ``` +Create a file at +example/android/app/src/androidTest/java/com/example/myapp/MainActivityTest.java +with the following contents, replacing com, example, and myapp with your values: + +``` +package com.example.myapp; + + import androidx.test.rule.ActivityTestRule; +import dev.flutter.plugins.instrumentationadapter.FlutterRunner; +import dev.flutter.plugins.instrumentationadapter.FlutterTest; +import org.junit.runner.RunWith; + +@RunWith(FlutterRunner.class) +public class MainActivityTest extends FlutterTest { + public void launchActivity() { + ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); + rule.launchActivity(null); + } +}``` + Use gradle commands to build an instrumentation test for Android. ``` From 61987407598000ed54f9680e5eb1a75fc16b121b Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 27 Aug 2019 14:07:24 -0700 Subject: [PATCH 3/5] Tweak docs --- packages/instrumentation_adapter/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/instrumentation_adapter/README.md b/packages/instrumentation_adapter/README.md index 72f87a2d663f..82af17d9a0d6 100644 --- a/packages/instrumentation_adapter/README.md +++ b/packages/instrumentation_adapter/README.md @@ -22,9 +22,10 @@ void main() { } ``` -Create a file at -example/android/app/src/androidTest/java/com/example/myapp/MainActivityTest.java -with the following contents, replacing com, example, and myapp with your values: +Create an instrumentation file in your application's +android/app/src/androidTest/java/com/example/myapp/ directory +(replacing com, example, and myapp with your values). You can +call this file MainActivityTest.java or another name of your choice. ``` package com.example.myapp; From 9ebbf79077d687c6a7215d83e7b6d5fc58af171d Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 27 Aug 2019 14:11:23 -0700 Subject: [PATCH 4/5] A few more typo fixes --- packages/instrumentation_adapter/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/instrumentation_adapter/README.md b/packages/instrumentation_adapter/README.md index 82af17d9a0d6..6b5f3f988c7f 100644 --- a/packages/instrumentation_adapter/README.md +++ b/packages/instrumentation_adapter/README.md @@ -22,15 +22,16 @@ void main() { } ``` -Create an instrumentation file in your application's +Create an instrumentation test file in your application's android/app/src/androidTest/java/com/example/myapp/ directory -(replacing com, example, and myapp with your values). You can -call this file MainActivityTest.java or another name of your choice. +(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. ``` package com.example.myapp; - import androidx.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import dev.flutter.plugins.instrumentationadapter.FlutterRunner; import dev.flutter.plugins.instrumentationadapter.FlutterTest; import org.junit.runner.RunWith; From eb75b7c4c535f8d8ad377ca8b73a2a6bb0d05408 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Tue, 27 Aug 2019 14:13:09 -0700 Subject: [PATCH 5/5] Code review feedback --- packages/instrumentation_adapter/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/instrumentation_adapter/README.md b/packages/instrumentation_adapter/README.md index 6b5f3f988c7f..972790bae5e0 100644 --- a/packages/instrumentation_adapter/README.md +++ b/packages/instrumentation_adapter/README.md @@ -34,10 +34,12 @@ package com.example.myapp; import androidx.test.rule.ActivityTestRule; import dev.flutter.plugins.instrumentationadapter.FlutterRunner; import dev.flutter.plugins.instrumentationadapter.FlutterTest; +import java.lang.Override; import org.junit.runner.RunWith; @RunWith(FlutterRunner.class) public class MainActivityTest extends FlutterTest { + @Override public void launchActivity() { ActivityTestRule rule = new ActivityTestRule<>(MainActivity.class); rule.launchActivity(null);