Skip to content

Commit b54deb3

Browse files
committed
Add DefaultInterpolatedStringHandler for SendAdbRequest
Replaces StringBuilder usage with DefaultInterpolatedStringHandler Updates method signatures and implementations across AdbClient, AdbSocket, PackageManager, and related classes to support the new handler.
1 parent 0340b8a commit b54deb3

32 files changed

Lines changed: 583 additions & 453 deletions

AdvancedSharpAdbClient.Tests/AdbClientTests.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ public void FormAdbRequestTest()
6565
Assert.Equal("000Chost:version"u8, AdbClient.FormAdbRequest("host:version"));
6666
}
6767

68+
/// <summary>
69+
/// Tests the <see cref="AdbClient.FormAdbRequest(ReadOnlySpan{char})"/> method.
70+
/// </summary>
71+
[Fact]
72+
public void FormAdbRequestSpanTest()
73+
{
74+
Assert.Equal("0009host:kill"u8, AdbClient.FormAdbRequest("host:kill".AsSpan()));
75+
Assert.Equal("000Chost:version"u8, AdbClient.FormAdbRequest("host:version".AsSpan()));
76+
}
77+
6878
/// <summary>
6979
/// Tests the <see cref="AdbClient.CreateAdbForwardRequest(string, int)"/> method.
7080
/// </summary>
@@ -75,6 +85,16 @@ public void CreateAdbForwardRequestTest()
7585
Assert.Equal("0012tcp:1981:127.0.0.1"u8, AdbClient.CreateAdbForwardRequest("127.0.0.1", 1981));
7686
}
7787

88+
/// <summary>
89+
/// Tests the <see cref="AdbClient.CreateAdbForwardRequest(ReadOnlySpan{char}, int)"/> method.
90+
/// </summary>
91+
[Fact]
92+
public void CreateAdbForwardRequestSpanTest()
93+
{
94+
Assert.Equal("0008tcp:1984"u8, AdbClient.CreateAdbForwardRequest([], 1984));
95+
Assert.Equal("0012tcp:1981:127.0.0.1"u8, AdbClient.CreateAdbForwardRequest("127.0.0.1".AsSpan(), 1981));
96+
}
97+
7898
/// <summary>
7999
/// Tests the <see cref="AdbClient.GetAdbVersion"/> method.
80100
/// </summary>

AdvancedSharpAdbClient.Tests/AdbSocketTests.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.IO;
3+
using System.Runtime.CompilerServices;
34
using System.Text;
45
using Xunit;
56

@@ -266,6 +267,17 @@ public void SendAdbRequestTest() =>
266267
socket => socket.SendAdbRequest("Test"),
267268
"0004Test"u8.ToArray());
268269

270+
/// <summary>
271+
/// Tests the <see cref="AdbSocket.SendAdbRequest(DefaultInterpolatedStringHandler)"/> method.
272+
/// </summary>
273+
[Fact]
274+
public void SendAdbRequestSpanTest()
275+
{
276+
RunTest(
277+
socket => socket.SendAdbRequest((DefaultInterpolatedStringHandler)$"Test"),
278+
"0004Test"u8.ToArray());
279+
}
280+
269281
/// <summary>
270282
/// Tests the <see cref="AdbSocket.GetShellStream"/> method.
271283
/// </summary>

AdvancedSharpAdbClient.Tests/Dummys/DummyAdbSocket.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Net.Sockets;
5+
using System.Runtime.CompilerServices;
56
using System.Threading;
67
using System.Threading.Tasks;
78
using Xunit;
@@ -65,6 +66,8 @@ internal partial class DummyAdbSocket : IDummyAdbSocket, ICloneable<DummyAdbSock
6566

6667
public void SendAdbRequest(string request) => Requests.Add(request);
6768

69+
public void SendAdbRequest(DefaultInterpolatedStringHandler request) => Requests.Add(request.ToString());
70+
6871
public int Read(byte[] data)
6972
{
7073
Span<byte> actual = SyncDataReceived.Dequeue();

AdvancedSharpAdbClient/AdbClient.Async.cs

Lines changed: 86 additions & 94 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)