Skip to content

Commit 9c3bfb2

Browse files
wherewherewherewhere
committed
Improve the output of ToString
1 parent 7268203 commit 9c3bfb2

File tree

16 files changed

+500
-244
lines changed

16 files changed

+500
-244
lines changed

‎AdvancedSharpAdbClient.Tests/Models/DeviceDataTests.cs‎

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class DeviceDataTests
1111
[Fact]
1212
public void CreateFromDeviceDataVSEmulatorTest()
1313
{
14-
string data = @"169.254.138.177:5555 offline product:VS Emulator Android Device - 480 x 800 model:Android_Device___480_x_800 device:donatello";
14+
string data = "169.254.138.177:5555 offline product:VS Emulator Android Device - 480 x 800 model:Android_Device___480_x_800 device:donatello";
1515

1616
DeviceData device = DeviceData.CreateFromAdbData(data);
1717
Assert.Equal("169.254.138.177:5555", device.Serial);
@@ -25,7 +25,7 @@ public void CreateFromDeviceDataVSEmulatorTest()
2525
[Fact]
2626
public void CreateFromDeviceNoPermissionTest()
2727
{
28-
string data = "009d1cd696d5194a no permissions (user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html";
28+
string data = "009d1cd696d5194a no permissions (user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html]";
2929

3030
DeviceData device = DeviceData.CreateFromAdbData(data);
3131
Assert.Equal("009d1cd696d5194a", device.Serial);
@@ -34,15 +34,15 @@ public void CreateFromDeviceNoPermissionTest()
3434
Assert.Equal(string.Empty, device.Name);
3535
Assert.Equal(string.Empty, device.Features);
3636
Assert.Equal(DeviceState.NoPermissions, device.State);
37-
Assert.Equal(" (user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html", device.Message);
37+
Assert.Equal("(user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html]", device.Message);
3838
Assert.Equal(string.Empty, device.Usb);
3939
Assert.Equal(string.Empty, device.TransportId);
4040
}
4141

4242
[Fact]
4343
public void CreateFromDeviceDataAuthorizingTest()
4444
{
45-
string data = "52O00ULA01 authorizing usb:9-1.4.1 transport_id:8149";
45+
string data = "52O00ULA01 authorizing usb:9-1.4.1 transport_id:8149";
4646

4747
DeviceData device = DeviceData.CreateFromAdbData(data);
4848
Assert.Equal("52O00ULA01", device.Serial);
@@ -58,7 +58,7 @@ public void CreateFromDeviceDataAuthorizingTest()
5858
[Fact]
5959
public void CreateFromDeviceDataUnauthorizedTest()
6060
{
61-
string data = "R32D102SZAE unauthorized";
61+
string data = "R32D102SZAE unauthorized";
6262

6363
DeviceData device = DeviceData.CreateFromAdbData(data);
6464
Assert.Equal("R32D102SZAE", device.Serial);
@@ -72,7 +72,7 @@ public void CreateFromDeviceDataUnauthorizedTest()
7272
[Fact]
7373
public void CreateFromEmulatorTest()
7474
{
75-
string data = "emulator-5586 host features:shell_2";
75+
string data = "emulator-5586 host features:shell_2";
7676

7777
DeviceData device = DeviceData.CreateFromAdbData(data);
7878
Assert.Equal("emulator-5586", device.Serial);
@@ -100,7 +100,7 @@ public void CreateWithFeaturesTest()
100100
public void CreateWithUsbDataTest()
101101
{
102102
// As seen on Linux
103-
string data = "EAOKCY112414 device usb:1-1 product:WW_K013 model:K013 device:K013_1";
103+
string data = "EAOKCY112414 device usb:1-1 product:WW_K013 model:K013 device:K013_1";
104104

105105
DeviceData device = DeviceData.CreateFromAdbData(data);
106106
Assert.Equal("EAOKCY112414", device.Serial);
@@ -116,7 +116,7 @@ public void CreateWithoutModelTest()
116116
{
117117
// As seen for devices in recovery mode
118118
// See https://github.com/quamotion/madb/pull/85/files
119-
string data = "ZY3222LBDC recovery usb:337641472X product:omni_cedric device:cedric";
119+
string data = "ZY3222LBDC recovery usb:337641472X product:omni_cedric device:cedric";
120120

121121
DeviceData device = DeviceData.CreateFromAdbData(data);
122122
Assert.Equal("ZY3222LBDC", device.Serial);
@@ -130,7 +130,7 @@ public void CreateWithoutModelTest()
130130
[Fact]
131131
public void CreateNoPermissionTest()
132132
{
133-
string data = "009d1cd696d5194a no permissions";
133+
string data = "009d1cd696d5194a no permissions";
134134

135135
DeviceData device = DeviceData.CreateFromAdbData(data);
136136
Assert.Equal("009d1cd696d5194a", device.Serial);
@@ -140,7 +140,7 @@ public void CreateNoPermissionTest()
140140
[Fact]
141141
public void CreateWithUnderscoresTest()
142142
{
143-
string data = "99000000 device product:if_s200n model:NL_V100KR device:if_s200n";
143+
string data = "99000000 device product:if_s200n model:NL_V100KR device:if_s200n";
144144

145145
DeviceData device = DeviceData.CreateFromAdbData(data);
146146
Assert.Equal("99000000", device.Serial);
@@ -149,36 +149,10 @@ public void CreateWithUnderscoresTest()
149149
Assert.Equal("if_s200n", device.Name);
150150
}
151151

152-
[Fact]
153-
public void CreateFromInvalidDataTest()
154-
{
155-
string data = "xyz";
156-
157-
_ = Assert.Throws<ArgumentException>(() => DeviceData.CreateFromAdbData(data));
158-
}
159-
160-
[Fact]
161-
public void ToStringTest()
162-
{
163-
DeviceData d = new()
164-
{
165-
Serial = "xyz"
166-
};
167-
168-
Assert.Equal("xyz", d.ToString());
169-
}
170-
171-
[Fact]
172-
public void GetStateFromStringTest()
173-
{
174-
Assert.Equal(DeviceState.NoPermissions, DeviceData.GetStateFromString("no permissions"));
175-
Assert.Equal(DeviceState.Unknown, DeviceData.GetStateFromString("hello"));
176-
}
177-
178152
[Theory]
179-
[InlineData("R32D102SZAE device transport_id:6", "R32D102SZAE", "", "", "", "6")]
180-
[InlineData("emulator-5554 device product:sdk_google_phone_x86 model:Android_SDK_built_for_x86 device:generic_x86 transport_id:1", "emulator-5554", "sdk_google_phone_x86", "Android_SDK_built_for_x86", "generic_x86", "1")]
181-
[InlineData("00bc13bcf4bacc62 device product:bullhead model:Nexus_5X device:bullhead transport_id:1", "00bc13bcf4bacc62", "bullhead", "Nexus_5X", "bullhead", "1")]
153+
[InlineData("R32D102SZAE device transport_id:6", "R32D102SZAE", "", "", "", "6")]
154+
[InlineData("emulator-5554 device product:sdk_google_phone_x86 model:Android_SDK_built_for_x86 device:generic_x86 transport_id:1", "emulator-5554", "sdk_google_phone_x86", "Android_SDK_built_for_x86", "generic_x86", "1")]
155+
[InlineData("00bc13bcf4bacc62 device product:bullhead model:Nexus_5X device:bullhead transport_id:1", "00bc13bcf4bacc62", "bullhead", "Nexus_5X", "bullhead", "1")]
182156
public void CreateFromDeviceDataTransportIdTest(string data, string serial, string product, string model, string name, string transportId)
183157
{
184158
DeviceData device = DeviceData.CreateFromAdbData(data);
@@ -202,14 +176,50 @@ public void CreateFromDeviceDataConnectingTest()
202176
Assert.Equal(string.Empty, device.Model);
203177
Assert.Equal(string.Empty, device.Name);
204178
Assert.Equal(string.Empty, device.TransportId);
205-
Assert.Equal(DeviceState.Unknown, device.State);
179+
Assert.Equal(DeviceState.Connecting, device.State);
206180
Assert.Equal(string.Empty, device.Usb);
207181
}
208182

183+
[Fact]
184+
public void CreateFromInvalidDataTest()
185+
{
186+
string data = "xyz";
187+
188+
_ = Assert.Throws<ArgumentException>(() => DeviceData.CreateFromAdbData(data));
189+
}
190+
191+
[Theory]
192+
[InlineData("169.254.138.177:5555\toffline product:VS Emulator Android Device - 480 x 800 model:Android_Device___480_x_800 device:donatello")]
193+
[InlineData("009d1cd696d5194a\tno permissions (user in plugdev group; are your udev rules wrong?); see [http://developer.android.com/tools/device.html]")]
194+
[InlineData("52O00ULA01\tauthorizing usb:9-1.4.1 transport_id:8149")]
195+
[InlineData("R32D102SZAE\tunauthorized")]
196+
[InlineData("emulator-5586\thost features:shell_2")]
197+
[InlineData("0100a9ee51a18f2b\tdevice product:bullhead model:Nexus_5X device:bullhead features:shell_v2,cmd")]
198+
[InlineData("EAOKCY112414\tdevice usb:1-1 product:WW_K013 model:K013 device:K013_1")]
199+
[InlineData("ZY3222LBDC\trecovery usb:337641472X product:omni_cedric device:cedric")]
200+
[InlineData("009d1cd696d5194a\tno permissions")]
201+
[InlineData("99000000\tdevice product:if_s200n model:NL_V100KR device:if_s200n")]
202+
[InlineData("R32D102SZAE\tdevice transport_id:6")]
203+
[InlineData("emulator-5554\tdevice product:sdk_google_phone_x86 model:Android_SDK_built_for_x86 device:generic_x86 transport_id:1")]
204+
[InlineData("00bc13bcf4bacc62\tdevice product:bullhead model:Nexus_5X device:bullhead transport_id:1")]
205+
[InlineData("00bc13bcf4bacc62\tconnecting")]
206+
public void ToStringTest(string data)
207+
{
208+
DeviceData device = DeviceData.CreateFromAdbData(data);
209+
Assert.Equal(data, device.ToString());
210+
}
211+
212+
[Fact]
213+
public void GetStateFromStringTest()
214+
{
215+
Assert.Equal(DeviceState.NoPermissions, DeviceData.GetStateFromString("no permissions"));
216+
Assert.Equal(DeviceState.Unknown, DeviceData.GetStateFromString("hello"));
217+
}
218+
209219
[Theory]
210-
[InlineData("R32D102SZAE device transport_id:6", "R32D102SZAE", "", "", "", "6")]
211-
[InlineData("emulator-5554 device product:sdk_google_phone_x86 model:Android_SDK_built_for_x86 device:generic_x86 transport_id:1", "emulator-5554", "sdk_google_phone_x86", "Android_SDK_built_for_x86", "generic_x86", "1")]
212-
[InlineData("00bc13bcf4bacc62 device product:bullhead model:Nexus_5X device:bullhead transport_id:1", "00bc13bcf4bacc62", "bullhead", "Nexus_5X", "bullhead", "1")]
220+
[InlineData("R32D102SZAE device transport_id:6", "R32D102SZAE", "", "", "", "6")]
221+
[InlineData("emulator-5554 device product:sdk_google_phone_x86 model:Android_SDK_built_for_x86 device:generic_x86 transport_id:1", "emulator-5554", "sdk_google_phone_x86", "Android_SDK_built_for_x86", "generic_x86", "1")]
222+
[InlineData("00bc13bcf4bacc62 device product:bullhead model:Nexus_5X device:bullhead transport_id:1", "00bc13bcf4bacc62", "bullhead", "Nexus_5X", "bullhead", "1")]
213223
public void EqualityTest(string data, string serial, string product, string model, string name, string transportId)
214224
{
215225
DeviceData d1 = DeviceData.CreateFromAdbData(data);

0 commit comments

Comments
 (0)