From cf8fbc363af1e7385f9db187aebcabe809efdec6 Mon Sep 17 00:00:00 2001 From: "James D. Lin" Date: Tue, 30 Jun 2020 11:28:02 -0700 Subject: [PATCH] [flutter tools] Revert desktop device name changes and print the category instead (#60395) --- packages/flutter_tools/lib/src/device.dart | 2 +- packages/flutter_tools/lib/src/linux/linux_device.dart | 2 +- packages/flutter_tools/lib/src/macos/macos_device.dart | 2 +- packages/flutter_tools/lib/src/windows/windows_device.dart | 2 +- .../test/commands.shard/hermetic/devices_test.dart | 4 ++-- .../test/general.shard/linux/linux_device_test.dart | 2 +- .../test/general.shard/macos/macos_device_test.dart | 2 +- .../test/general.shard/windows/windows_device_test.dart | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 2be566f49d8..cb9725fb708 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -559,7 +559,7 @@ abstract class Device { supportIndicator += ' ($type)'; } table.add([ - device.name, + '${device.name} (${device.category})', device.id, getNameForTargetPlatform(targetPlatform), '${await device.sdkNameAndVersion}$supportIndicator', diff --git a/packages/flutter_tools/lib/src/linux/linux_device.dart b/packages/flutter_tools/lib/src/linux/linux_device.dart index 4b83156f500..2cc4295c53c 100644 --- a/packages/flutter_tools/lib/src/linux/linux_device.dart +++ b/packages/flutter_tools/lib/src/linux/linux_device.dart @@ -26,7 +26,7 @@ class LinuxDevice extends DesktopDevice { bool isSupported() => true; @override - String get name => 'Linux desktop'; + String get name => 'Linux'; @override Future get targetPlatform async => TargetPlatform.linux_x64; diff --git a/packages/flutter_tools/lib/src/macos/macos_device.dart b/packages/flutter_tools/lib/src/macos/macos_device.dart index 1ce7df49a12..1d7ef01502b 100644 --- a/packages/flutter_tools/lib/src/macos/macos_device.dart +++ b/packages/flutter_tools/lib/src/macos/macos_device.dart @@ -24,7 +24,7 @@ class MacOSDevice extends DesktopDevice { bool isSupported() => true; @override - String get name => 'macOS desktop'; + String get name => 'macOS'; @override Future get targetPlatform async => TargetPlatform.darwin_x64; diff --git a/packages/flutter_tools/lib/src/windows/windows_device.dart b/packages/flutter_tools/lib/src/windows/windows_device.dart index 50ebcf58dc5..91550a688b0 100644 --- a/packages/flutter_tools/lib/src/windows/windows_device.dart +++ b/packages/flutter_tools/lib/src/windows/windows_device.dart @@ -27,7 +27,7 @@ class WindowsDevice extends DesktopDevice { bool isSupported() => true; @override - String get name => 'Windows desktop'; + String get name => 'Windows'; @override Future get targetPlatform async => TargetPlatform.windows_x64; diff --git a/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart index a91325924b4..0e6dd41e4e1 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart @@ -120,8 +120,8 @@ void main() { ''' 2 connected devices: -ephemeral • ephemeral • android-arm • Test SDK (1.2.3) (emulator) -webby • webby • web-javascript • Web SDK (1.2.4) (emulator) +ephemeral (mobile) • ephemeral • android-arm • Test SDK (1.2.3) (emulator) +webby (mobile) • webby • web-javascript • Web SDK (1.2.4) (emulator) • Cannot connect to device ABC ''' diff --git a/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart b/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart index c4f976a1c9c..72ec9f7985e 100644 --- a/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart +++ b/packages/flutter_tools/test/general.shard/linux/linux_device_test.dart @@ -28,7 +28,7 @@ void main() { testWithoutContext('LinuxDevice defaults', () async { final PrebuiltLinuxApp linuxApp = PrebuiltLinuxApp(executable: 'foo'); expect(await device.targetPlatform, TargetPlatform.linux_x64); - expect(device.name, 'Linux desktop'); + expect(device.name, 'Linux'); expect(await device.installApp(linuxApp), true); expect(await device.uninstallApp(linuxApp), true); expect(await device.isLatestBuildInstalled(linuxApp), true); diff --git a/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart b/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart index c893914d10c..728a596d5e7 100644 --- a/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/macos_device_test.dart @@ -40,7 +40,7 @@ void main() { testUsingContext('defaults', () async { final MockMacOSApp mockMacOSApp = MockMacOSApp(); expect(await device.targetPlatform, TargetPlatform.darwin_x64); - expect(device.name, 'macOS desktop'); + expect(device.name, 'macOS'); expect(await device.installApp(mockMacOSApp), true); expect(await device.uninstallApp(mockMacOSApp), true); expect(await device.isLatestBuildInstalled(mockMacOSApp), true); diff --git a/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart b/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart index b8b9bb27a91..2641677df38 100644 --- a/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart +++ b/packages/flutter_tools/test/general.shard/windows/windows_device_test.dart @@ -32,7 +32,7 @@ void main() { testUsingContext('defaults', () async { final PrebuiltWindowsApp windowsApp = PrebuiltWindowsApp(executable: 'foo'); expect(await device.targetPlatform, TargetPlatform.windows_x64); - expect(device.name, 'Windows desktop'); + expect(device.name, 'Windows'); expect(await device.installApp(windowsApp), true); expect(await device.uninstallApp(windowsApp), true); expect(await device.isLatestBuildInstalled(windowsApp), true);