From 1186d6831f1b7042ffb27ab2642f96e15da59626 Mon Sep 17 00:00:00 2001
From: stuartmorgan <stuartmorgan@google.com>
Date: Tue, 3 May 2022 00:44:10 -0400
Subject: [PATCH] [flutter_plugin_tools] Include examples in `test` (#5453)

---
 script/tool/CHANGELOG.md                |  3 +-
 script/tool/lib/src/test_command.dart   |  4 +-
 script/tool/pubspec.yaml                |  2 +-
 script/tool/test/test_command_test.dart | 50 +++++++++++++++++++++++--
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/script/tool/CHANGELOG.md b/script/tool/CHANGELOG.md
index 2ce644178f..b2319c63dc 100644
--- a/script/tool/CHANGELOG.md
+++ b/script/tool/CHANGELOG.md
@@ -1,5 +1,6 @@
-## NEXT
+## 0.8.5
 
+- Updates `test` to inculde the Dart unit tests of examples, if any.
 - `drive-examples` now supports non-plugin packages.
 - Commands that iterate over examples now include non-Flutter example packages.
 
diff --git a/script/tool/lib/src/test_command.dart b/script/tool/lib/src/test_command.dart
index d115b6557a..a1a995dbd8 100644
--- a/script/tool/lib/src/test_command.dart
+++ b/script/tool/lib/src/test_command.dart
@@ -36,6 +36,9 @@ class TestCommand extends PackageLoopingCommand {
   final String description = 'Runs the Dart tests for all packages.\n\n'
       'This command requires "flutter" to be in your path.';
 
+  @override
+  bool get includeSubpackages => true;
+
   @override
   Future<PackageResult> runForPackage(RepositoryPackage package) async {
     if (!package.directory.childDirectory('test').existsSync()) {
@@ -88,7 +91,6 @@ class TestCommand extends PackageLoopingCommand {
     exitCode = await processRunner.runAndStream(
       'dart',
       <String>[
-        'pub',
         'run',
         if (experiment.isNotEmpty) '--enable-experiment=$experiment',
         'test',
diff --git a/script/tool/pubspec.yaml b/script/tool/pubspec.yaml
index af38193294..32bfc1b622 100644
--- a/script/tool/pubspec.yaml
+++ b/script/tool/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_plugin_tools
 description: Productivity utils for flutter/plugins and flutter/packages
 repository: https://github.com/flutter/plugins/tree/main/script/tool
-version: 0.8.4
+version: 0.8.5
 
 dependencies:
   args: ^2.1.0
diff --git a/script/tool/test/test_command_test.dart b/script/tool/test/test_command_test.dart
index 9bcd8d1ae6..386eaf0d34 100644
--- a/script/tool/test/test_command_test.dart
+++ b/script/tool/test/test_command_test.dart
@@ -58,6 +58,28 @@ void main() {
       );
     });
 
+    test('runs flutter test on Flutter package example tests', () async {
+      final Directory pluginDir = createFakePlugin('a_plugin', packagesDir,
+          extraFiles: <String>[
+            'test/empty_test.dart',
+            'example/test/an_example_test.dart'
+          ]);
+
+      await runCapturingPrint(runner, <String>['test']);
+
+      expect(
+        processRunner.recordedCalls,
+        orderedEquals(<ProcessCall>[
+          ProcessCall(getFlutterCommand(mockPlatform),
+              const <String>['test', '--color'], pluginDir.path),
+          ProcessCall(
+              getFlutterCommand(mockPlatform),
+              const <String>['test', '--color'],
+              pluginDir.childDirectory('example').path),
+        ]),
+      );
+    });
+
     test('fails when Flutter tests fail', () async {
       createFakePlugin('plugin1', packagesDir,
           extraFiles: <String>['test/empty_test.dart']);
@@ -102,7 +124,7 @@ void main() {
       );
     });
 
-    test('runs pub run test on non-Flutter packages', () async {
+    test('runs dart run test on non-Flutter packages', () async {
       final Directory pluginDir = createFakePlugin('a', packagesDir,
           extraFiles: <String>['test/empty_test.dart']);
       final Directory packageDir = createFakePackage('b', packagesDir,
@@ -121,12 +143,34 @@ void main() {
           ProcessCall('dart', const <String>['pub', 'get'], packageDir.path),
           ProcessCall(
               'dart',
-              const <String>['pub', 'run', '--enable-experiment=exp1', 'test'],
+              const <String>['run', '--enable-experiment=exp1', 'test'],
               packageDir.path),
         ]),
       );
     });
 
+    test('runs dart run test on non-Flutter package examples', () async {
+      final Directory packageDir = createFakePackage('a_package', packagesDir,
+          extraFiles: <String>[
+            'test/empty_test.dart',
+            'example/test/an_example_test.dart'
+          ]);
+
+      await runCapturingPrint(runner, <String>['test']);
+
+      expect(
+        processRunner.recordedCalls,
+        orderedEquals(<ProcessCall>[
+          ProcessCall('dart', const <String>['pub', 'get'], packageDir.path),
+          ProcessCall('dart', const <String>['run', 'test'], packageDir.path),
+          ProcessCall('dart', const <String>['pub', 'get'],
+              packageDir.childDirectory('example').path),
+          ProcessCall('dart', const <String>['run', 'test'],
+              packageDir.childDirectory('example').path),
+        ]),
+      );
+    });
+
     test('fails when getting non-Flutter package dependencies fails', () async {
       createFakePackage('a_package', packagesDir,
           extraFiles: <String>['test/empty_test.dart']);
@@ -217,7 +261,7 @@ void main() {
           ProcessCall('dart', const <String>['pub', 'get'], packageDir.path),
           ProcessCall(
               'dart',
-              const <String>['pub', 'run', '--enable-experiment=exp1', 'test'],
+              const <String>['run', '--enable-experiment=exp1', 'test'],
               packageDir.path),
         ]),
       );