Merge pull request quamotion#107 from pbielinski/master

Update DeviceData.cs
hoangphuc79 · Dec 11, 2017 · 9719f5b · 9719f5b
2 parents 8b8979f + 94d6a02
commit 9719f5b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/SharpAdbClient.Tests/DeviceDataTests.cs b/SharpAdbClient.Tests/DeviceDataTests.cs
@@ -126,5 +126,19 @@ public void GetStateFromStringTest()
             Assert.AreEqual(DeviceState.NoPermissions, DeviceData.GetStateFromString("no permissions"));
             Assert.AreEqual(DeviceState.Unknown, DeviceData.GetStateFromString("hello"));
         }
+
+        [TestMethod]
+        public void CreateFromDeviceDataTransportIdTest()
+        {
+            string data = "R32D102SZAE            device transport_id:6";
+
+            var device = DeviceData.CreateFromAdbData(data);
+            Assert.AreEqual<string>("R32D102SZAE", device.Serial);
+            Assert.AreEqual<string>("", device.Product);
+            Assert.AreEqual<string>("", device.Model);
+            Assert.AreEqual<string>("", device.Name);
+            Assert.AreEqual<DeviceState>(DeviceState.Online, device.State);
+            Assert.AreEqual(string.Empty, device.Usb);
+        }
     }
 }
diff --git a/SharpAdbClient/DeviceData.cs b/SharpAdbClient/DeviceData.cs
@@ -16,7 +16,7 @@ public class DeviceData
         /// A regular expression that can be used to parse the device information that is returned
         /// by the Android Debut Bridge.
         /// </summary>
-        internal const string DeviceDataRegexString = @"^(?<serial>[a-zA-Z0-9_-]+(?:\s?[\.a-zA-Z0-9_-]+)?(?:\:\d{1,})?)\s+(?<state>device|offline|unknown|bootloader|recovery|download|unauthorized|host|no permissions)(\s+usb:(?<usb>[^:]+))?(?:\s+product:(?<product>[^:]+))?(\s+model\:(?<model>[\S]+))?(\s+device\:(?<device>[\S]+))?(\s+features:(?<features>[^:]+))?$";
+        internal const string DeviceDataRegexString = @"^(?<serial>[a-zA-Z0-9_-]+(?:\s?[\.a-zA-Z0-9_-]+)?(?:\:\d{1,})?)\s+(?<state>device|offline|unknown|bootloader|recovery|download|unauthorized|host|no permissions)(\s+usb:(?<usb>[^:]+))?(?:\s+product:(?<product>[^:]+))?(\s+model\:(?<model>[\S]+))?(\s+device\:(?<device>[\S]+))?(\s+features:(?<features>[^:]+))?(\s+transport_id:(?<transport_id>[^:]+))?$";
 
         /// <summary>
         /// A regular expression that can be used to parse the device information that is returned