Rename id to serial (#338)

Author: HakkyuKim

tools/lib/src/device.dart

@@ -47,9 +47,9 @@ class Device {
       tizenSdk: tizenSdk,
       processRunner: processRunner,
     );
-    device._id = device._findId();
-    if (device._id == null) {
-      throw Exception('$name($profile)\'s id is null. '
+    device._serial = device._findSerial();
+    if (device._serial == null) {
+      throw Exception('$name($profile)\'s serial is null. '
           'Physical device references must be connected to host PC.');
     }
     return device;
@@ -80,30 +80,33 @@ class Device {
 
   final TizenSdk _tizenSdk;
 
-  String? _id;
+  String? _serial;
 
   final ProcessRunner _processRunner;
 
   /// The unqiue identifier assigned to a connected device.
-  String? get id => _id;
+  /// 
+  /// Physical devices have baked in serial numbers while emulators
+  /// are assigned with a port number when they're launched.
+  String? get serial => _serial;
 
   /// Whether this device is an emulator.
   bool get isEmulator => false;
 
   /// Whether this device is connected to host PC.
   bool get isConnected {
-    _id = _findId();
-    return _id != null;
+    _serial = _findSerial();
+    return _serial != null;
   }
 
   static final RegExp _logPattern =
       RegExp(r'\d\d:\d\d\s+([(\+\d+\s+)|(~\d+\s+)|(\-\d+\s+)]+):\s+(.*)');
 
-  String? _findId() {
+  String? _findSerial() {
     final List<SdbDeviceInfo> deviceInfos = _tizenSdk.sdbDevices();
     for (final SdbDeviceInfo deviceInfo in deviceInfos) {
       if (deviceInfo.name == name) {
-        return deviceInfo.id;
+        return deviceInfo.serial;
       }
     }
     return null;
@@ -133,7 +136,7 @@ class Device {
 
     final io.Process process = await _processRunner.start(
       'flutter-tizen',
-      <String>['-d', id!, 'test', 'integration_test'],
+      <String>['-d', serial!, 'test', 'integration_test'],
       workingDirectory: workingDir,
     );
 
@@ -207,7 +210,7 @@ class EmulatorDevice extends Device {
       tizenSdk: tizenSdk,
       processRunner: processRunner,
     );
-    emulatorDevice._id = emulatorDevice._findId();
+    emulatorDevice._serial = emulatorDevice._findSerial();
     emulatorDevice._pid = findEmulatorPid(name);
     return emulatorDevice;
   }
@@ -228,9 +231,9 @@ class EmulatorDevice extends Device {
 
   @override
   bool get isConnected {
-    _id = _findId();
+    _serial = _findSerial();
     _pid = findEmulatorPid(name);
-    return _id != null && _pid != null;
+    return _serial != null && _pid != null;
   }
 
   @override
@@ -309,7 +312,7 @@ class EmulatorDevice extends Device {
       }
       return false;
     });
-    _id = _findId();
+    _serial = _findSerial();
   }
 
   /// Closes this emulator.
@@ -335,7 +338,7 @@ class EmulatorDevice extends Device {
       return true;
     });
     _pid = null;
-    _id = null;
+    _serial = null;
   }
 
   Future<void> _poll(

tools/lib/src/integration_test_command.dart

@@ -235,14 +235,14 @@ class IntegrationTestCommand extends PackageLoopingCommand {
     final List<SdbDeviceInfo> deviceInfos = _tizenSdk.sdbDevices();
     for (final SdbDeviceInfo deviceInfo in deviceInfos) {
       final Map<String, String> capability =
-          _tizenSdk.sdbCapability(deviceInfo.id);
+          _tizenSdk.sdbCapability(deviceInfo.serial);
       final String? deviceType = capability['profile_name'];
       final String? version = capability['platform_version'];
       final String? cpuArch = capability['cpu_arch'];
       if (deviceType == null || version == null || cpuArch == null) {
         throw Exception(
             'Cannot extract profile, Tizen version, or cpu arch from '
-            'target ${deviceInfo.id}.\n'
+            'target ${deviceInfo.serial}.\n'
             'profile: $deviceType\n'
             'Tizen version: $version\n'
             'cpu arch: $cpuArch');

tools/lib/src/tizen_sdk.dart

@@ -13,18 +13,18 @@ import 'package:pub_semver/pub_semver.dart';
 
 import 'process_runner_apis.dart';
 
-/// A data type that holds information such as id and status of
+/// A data type that holds information such as serial and status of
 /// a connected device.
 class SdbDeviceInfo {
   /// Creates a [SdbDeviceInfo] instance.
   const SdbDeviceInfo({
-    required this.id,
+    required this.serial,
     required this.status,
     required this.name,
   });
 
   /// The unique string that identifies a running device.
-  final String id;
+  final String serial;
 
   /// The current connection state of the device.
   ///
@@ -228,7 +228,7 @@ class TizenSdk {
       }
 
       deviceInfos.add(SdbDeviceInfo(
-        id: tokens[0],
+        serial: tokens[0],
         status: tokens[1],
         name: tokens[2],
       ));
@@ -238,11 +238,11 @@ class TizenSdk {
   }
 
   /// Returns the result of running sdb capability as a map of key-value pairs.
-  Map<String, String> sdbCapability(String id) {
+  Map<String, String> sdbCapability(String serial) {
     final io.ProcessResult result =
-        _processRunner.runSync(sdb.path, <String>['-s', id, 'capability']);
+        _processRunner.runSync(sdb.path, <String>['-s', serial, 'capability']);
     if (result.exitCode != 0) {
-      print('Error: running command `sdb -s $id capability` failed.');
+      print('Error: running command `sdb -s $serial capability` failed.');
       throw ToolExit(result.exitCode);
     }