[devicelab] split end to end tests into driver targets (#68410)

Split the integration_ui target into individual driver tests. Remove disabled screenshot tests

dev/devicelab/bin/tasks/flutter_driver_screenshot_test_fuchsia.dart → dev/devicelab/bin/tasks/integration_ui_driver.dart

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_devicelab/tasks/integration_tests.dart';
 import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.fuchsia;
-  await task(createFlutterDriverScreenshotTest());
+  deviceOperatingSystem = DeviceOperatingSystem.android;
+  await task(createEndToEndDriverTest());
 }

dev/devicelab/bin/tasks/flutter_driver_screenshot_test_ios.dart → dev/devicelab/bin/tasks/integration_ui_ios_driver.dart

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_devicelab/tasks/integration_tests.dart';
 import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:flutter_devicelab/tasks/integration_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(createFlutterDriverScreenshotTest());
+  await task(createEndToEndDriverTest());
 }

dev/devicelab/bin/tasks/integration_ui_ios.dart → dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter_devicelab/tasks/integration_ui.dart';
+import 'package:flutter_devicelab/tasks/integration_tests.dart';
 import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
 
-/// End to end tests for iOS.
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.ios;
-  await task(runEndToEndTests);
+  await task(createEndToEndKeyboardTest());
 }

dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart

+// 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 'package:flutter_devicelab/tasks/integration_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
+  await task(createEndToEndScreenshotTest());
+}

dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart

+// 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 'package:flutter_devicelab/tasks/integration_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.ios;
+  await task(createEndToEndKeyboardTextfieldTest());
+}

dev/devicelab/bin/tasks/integration_ui.dart → dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter_devicelab/tasks/integration_ui.dart';
+import 'package:flutter_devicelab/tasks/integration_tests.dart';
 import 'package:flutter_devicelab/framework/adb.dart';
 import 'package:flutter_devicelab/framework/framework.dart';
 
-/// End to end tests for Android.
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.android;
-  await task(runEndToEndTests);
+  await task(createEndToEndKeyboardTest());
 }

dev/devicelab/bin/tasks/integration_ui_screenshot.dart

+// 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 'package:flutter_devicelab/tasks/integration_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.android;
+  await task(createEndToEndScreenshotTest());
+}

dev/devicelab/bin/tasks/integration_ui_textfield.dart

+// 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 'package:flutter_devicelab/tasks/integration_tests.dart';
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+
+Future<void> main() async {
+  deviceOperatingSystem = DeviceOperatingSystem.android;
+  await task(createEndToEndKeyboardTextfieldTest());
+}

dev/devicelab/lib/tasks/integration_tests.dart

@@ -92,19 +92,38 @@ TaskFunction createAndroidSplashScreenKitchenSinkTest() {
   );
 }
 
-/// Executes a driver test that takes a screenshot and compares it against a golden image.
-/// The golden image is served by Flutter Gold (https://flutter-gold.skia.org/).
-TaskFunction createFlutterDriverScreenshotTest() {
+TaskFunction createIOSPlatformViewTests() {
   return DriverTest(
-    '${flutterDirectory.path}/dev/integration_tests/flutter_driver_screenshot_test',
+    '${flutterDirectory.path}/dev/integration_tests/ios_platform_view_tests',
     'lib/main.dart',
   );
 }
 
-TaskFunction createIOSPlatformViewTests() {
+TaskFunction createEndToEndKeyboardTest() {
   return DriverTest(
-    '${flutterDirectory.path}/dev/integration_tests/ios_platform_view_tests',
-    'lib/main.dart',
+    '${flutterDirectory.path}/dev/integration_tests/ui',
+    'lib/keyboard_resize.dart',
+  );
+}
+
+TaskFunction createEndToEndDriverTest() {
+  return DriverTest(
+    '${flutterDirectory.path}/dev/integration_tests/ui',
+    'lib/driver.dart',
+  );
+}
+
+TaskFunction createEndToEndScreenshotTest() {
+  return DriverTest(
+    '${flutterDirectory.path}/dev/integration_tests/ui',
+    'lib/screenshot.dart',
+  );
+}
+
+TaskFunction createEndToEndKeyboardTextfieldTest() {
+  return DriverTest(
+    '${flutterDirectory.path}/dev/integration_tests/ui',
+    'lib/keyboard_textfield.dart',
   );
 }
 

dev/devicelab/lib/tasks/integration_ui.dart

-// 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:io';
-
-import '../framework/adb.dart';
-import '../framework/task_result.dart';
-import '../framework/utils.dart';
-
-Future<TaskResult> runEndToEndTests() async {
-  final Device device = await devices.workingDevice;
-  await device.unlock();
-  final String deviceId = device.deviceId;
-  final Directory testDirectory = dir('${flutterDirectory.path}/dev/integration_tests/ui');
-  await inDirectory<void>(testDirectory, () async {
-    await flutter('packages', options: <String>['get']);
-
-    const List<String> entryPoints = <String>[
-      'lib/keyboard_resize.dart',
-      'lib/driver.dart',
-      'lib/screenshot.dart',
-      'lib/keyboard_textfield.dart',
-    ];
-
-    for (final String entryPoint in entryPoints) {
-      await flutter('drive', options: <String>['--verbose', '-d', deviceId, entryPoint]);
-    }
-  });
-
-  return TaskResult.success(<String, dynamic>{});
-}

dev/devicelab/manifest.yaml

@@ -401,12 +401,30 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["mac/android"]
 
-  integration_ui:
+  integration_ui_driver:
     description: >
       Runs end-to-end Flutter tests on Android.
     stage: devicelab
     required_agent_capabilities: ["mac/android"]
 
+  integration_ui_keyboard_resize:
+    description: >
+      Runs end-to-end Flutter tests on Android.
+    stage: devicelab
+    required_agent_capabilities: [ "mac/android" ]
+
+  integration_ui_screenshot:
+    description: >
+      Runs end-to-end Flutter tests on Android.
+    stage: devicelab
+    required_agent_capabilities: [ "mac/android" ]
+
+  integration_ui_textfield:
+    description: >
+      Runs end-to-end Flutter tests on Android.
+    stage: devicelab
+    required_agent_capabilities: [ "mac/android" ]
+
   commands_test:
     description: >
       Runs tests of flutter run commands.
@@ -608,7 +626,25 @@ tasks:
     stage: devicelab_ios
     required_agent_capabilities: ["mac/ios"]
 
-  integration_ui_ios:
+  integration_ui_ios_driver:
+    description: >
+      Runs end-to-end Flutter tests on iPhone 6.
+    stage: devicelab_ios
+    required_agent_capabilities: ["mac/ios"]
+
+  integration_ui_ios_keyboard_resize:
+    description: >
+      Runs end-to-end Flutter tests on iPhone 6.
+    stage: devicelab_ios
+    required_agent_capabilities: ["mac/ios"]
+
+  integration_ui_ios_screenshot:
+    description: >
+      Runs end-to-end Flutter tests on iPhone 6.
+    stage: devicelab_ios
+    required_agent_capabilities: ["mac/ios"]
+
+  integration_ui_ios_textfield:
     description: >
       Runs end-to-end Flutter tests on iPhone 6.
     stage: devicelab_ios
@@ -899,16 +935,6 @@ tasks:
   #   required_agent_capabilities: ["linux/android"]
   #   flaky: true
 
-  # TODO(cyanglaz): Enable this test when we know how to test gold in device labs
-  # Or completely remove this test to LUCI when LUCI supports physical iOS devices.
-  # flutter_driver_screenshot_test_ios:
-  #   description: >
-  #     Screenshot tests running on a specifc iPhone 6.
-  #     The test makes sure that there is no regression while renderring an image with gl on iOS.
-  #   stage: devicelab_ios
-  #   required_agent_capabilities: ["mac/ios", "ios/gl-render-image"]
-  #   flaky: true
-
   flutter_gallery_v2_chrome_run_test:
     description: >
       Checks that the New Flutter Gallery runs successfully on Chrome.