[flutter tools] Revert desktop device name changes and print the category instead (flutter#60395)

jamesderlin · web-flow · commit cf8fbc363af1 · 2020-06-30T11:28:02.000-07:00
diff --git 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(<String>[
-        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
@@ -26,7 +26,7 @@ class LinuxDevice extends DesktopDevice {
   bool isSupported() => true;
 
   @override
-  String get name => 'Linux desktop';
+  String get name => 'Linux';
 
   @override
   Future<TargetPlatform> 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
@@ -24,7 +24,7 @@ class MacOSDevice extends DesktopDevice {
   bool isSupported() => true;
 
   @override
-  String get name => 'macOS desktop';
+  String get name => 'macOS';
 
   @override
   Future<TargetPlatform> 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
@@ -27,7 +27,7 @@ class WindowsDevice extends DesktopDevice {
   bool isSupported() => true;
 
   @override
-  String get name => 'Windows desktop';
+  String get name => 'Windows';
 
   @override
   Future<TargetPlatform> 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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ abstract class Device {`
`559`	`559`	`supportIndicator += ' ($type)';`
`560`	`560`	`}`
`561`	`561`	`table.add(<String>[`
`562`		`- device.name,`
	`562`	`+ '${device.name} (${device.category})',`
`563`	`563`	`device.id,`
`564`	`564`	`getNameForTargetPlatform(targetPlatform),`
`565`	`565`	`'${await device.sdkNameAndVersion}$supportIndicator',`