diff --git a/dev/devicelab/bin/tasks/android_defines_test.dart b/dev/devicelab/bin/tasks/android_defines_test.dart index ff4cdc7d669..c583efb45bd 100644 --- a/dev/devicelab/bin/tasks/android_defines_test.dart +++ b/dev/devicelab/bin/tasks/android_defines_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_devicelab/framework/adb.dart'; import 'package:flutter_devicelab/framework/framework.dart'; -import 'package:flutter_devicelab/tasks/defines_task.dart'; +import 'package:flutter_devicelab/tasks/integration_tests.dart'; /// Verify that dart defines work on Android. Future main() async { deviceOperatingSystem = DeviceOperatingSystem.android; - await task(runDartDefinesTask); + await task(dartDefinesTask()); } diff --git a/dev/devicelab/bin/tasks/ios_defines_test.dart b/dev/devicelab/bin/tasks/ios_defines_test.dart index 79cb91d29eb..5d73627b67a 100644 --- a/dev/devicelab/bin/tasks/ios_defines_test.dart +++ b/dev/devicelab/bin/tasks/ios_defines_test.dart @@ -4,10 +4,10 @@ import 'package:flutter_devicelab/framework/adb.dart'; import 'package:flutter_devicelab/framework/framework.dart'; -import 'package:flutter_devicelab/tasks/defines_task.dart'; +import 'package:flutter_devicelab/tasks/integration_tests.dart'; /// Verify that dart defines work on iOS. Future main() async { deviceOperatingSystem = DeviceOperatingSystem.ios; - await task(runDartDefinesTask); + await task(dartDefinesTask()); } diff --git a/dev/devicelab/lib/tasks/defines_task.dart b/dev/devicelab/lib/tasks/defines_task.dart deleted file mode 100644 index 8a9cb60c202..00000000000 --- a/dev/devicelab/lib/tasks/defines_task.dart +++ /dev/null @@ -1,31 +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:io'; - -import '../framework/adb.dart'; -import '../framework/task_result.dart'; -import '../framework/utils.dart'; - -Future runDartDefinesTask() 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(testDirectory, () async { - await flutter('packages', options: ['get']); - - await flutter('drive', options: [ - '--no-android-gradle-daemon', - '--verbose', - '-d', - deviceId, - '--dart-define=test.valueA=Example', - '--dart-define=test.valueB=Value', - 'lib/defines.dart', - ]); - }); - - return TaskResult.success({}); -} diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index 75c534078e5..30a5b4c964e 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -127,6 +127,16 @@ TaskFunction createEndToEndKeyboardTextfieldTest() { ); } +TaskFunction dartDefinesTask() { + return DriverTest( + '${flutterDirectory.path}/dev/integration_tests/ui', + 'lib/defines.dart', extraOptions: [ + '--dart-define=test.valueA=Example', + '--dart-define=test.valueB=Value', + ], + ); +} + class DriverTest { DriverTest( this.testDirectory,