Skip to content

Commit 28930d4

Browse files
wherewherewherewhere
committed
Use extension to extension
1 parent 2b75fee commit 28930d4

56 files changed

Lines changed: 723 additions & 710 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AdvancedSharpAdbClient.Tests/DeviceCommands/DeviceExtensionsTests.Async.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public async Task GetDirectoryAsyncListingTest()
164164
{
165165
Assert.Equal(remotePath, x.ArgAt<string>(0));
166166
Assert.Equal(default, x.ArgAt<CancellationToken>(1));
167-
return stats.AsEnumerableAsync(x.ArgAt<CancellationToken>(1));
167+
return stats.AsAsyncEnumerable(x.ArgAt<CancellationToken>(1));
168168
});
169169

170170
Factories.SyncServiceFactory = (c, d) =>

‎AdvancedSharpAdbClient.Tests/Dummys/DummyAdbClient.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public IAsyncEnumerable<string> ExecuteRemoteEnumerableAsync(string command, Dev
4141
public void ExecuteServerCommand(string target, string command)
4242
{
4343
StringBuilder requestBuilder = new();
44-
if (!StringExtensions.IsNullOrWhiteSpace(target))
44+
if (!string.IsNullOrWhiteSpace(target))
4545
{
4646
_ = requestBuilder.Append(target).Append(':');
4747
}
@@ -57,7 +57,7 @@ public void ExecuteServerCommand(string target, string command, IAdbSocket socke
5757
public void ExecuteServerCommand(string target, string command, IShellOutputReceiver receiver, Encoding encoding)
5858
{
5959
StringBuilder requestBuilder = new();
60-
if (!StringExtensions.IsNullOrWhiteSpace(target))
60+
if (!string.IsNullOrWhiteSpace(target))
6161
{
6262
_ = requestBuilder.Append(target).Append(':');
6363
}
@@ -92,7 +92,7 @@ public void ExecuteServerCommand(string target, string command, IAdbSocket socke
9292
public IEnumerable<string> ExecuteServerEnumerable(string target, string command, Encoding encoding)
9393
{
9494
StringBuilder requestBuilder = new();
95-
if (!StringExtensions.IsNullOrWhiteSpace(target))
95+
if (!string.IsNullOrWhiteSpace(target))
9696
{
9797
_ = requestBuilder.Append(target).Append(':');
9898
}
@@ -123,7 +123,7 @@ public async Task ExecuteServerCommandAsync(string target, string command, Cance
123123
await Task.Yield();
124124

125125
StringBuilder requestBuilder = new();
126-
if (!StringExtensions.IsNullOrWhiteSpace(target))
126+
if (!string.IsNullOrWhiteSpace(target))
127127
{
128128
_ = requestBuilder.Append(target).Append(':');
129129
}
@@ -139,7 +139,7 @@ public Task ExecuteServerCommandAsync(string target, string command, IAdbSocket
139139
public async Task ExecuteServerCommandAsync(string target, string command, IShellOutputReceiver receiver, Encoding encoding, CancellationToken cancellationToken = default)
140140
{
141141
StringBuilder requestBuilder = new();
142-
if (!StringExtensions.IsNullOrWhiteSpace(target))
142+
if (!string.IsNullOrWhiteSpace(target))
143143
{
144144
_ = requestBuilder.Append(target).Append(':');
145145
}
@@ -174,7 +174,7 @@ public Task ExecuteServerCommandAsync(string target, string command, IAdbSocket
174174
public async IAsyncEnumerable<string> ExecuteServerEnumerableAsync(string target, string command, Encoding encoding, [EnumeratorCancellation] CancellationToken cancellationToken)
175175
{
176176
StringBuilder requestBuilder = new();
177-
if (!StringExtensions.IsNullOrWhiteSpace(target))
177+
if (!string.IsNullOrWhiteSpace(target))
178178
{
179179
_ = requestBuilder.Append(target).Append(':');
180180
}

‎AdvancedSharpAdbClient.Tests/Extensions/AdbClientExtensionsTests.Async.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async Task ExecuteServerCommandAsyncTest()
5151
Assert.Equal(command, x.ArgAt<string>(1));
5252
Assert.Equal(encoding, x.ArgAt<Encoding>(2));
5353
Assert.Equal(default, x.ArgAt<CancellationToken>(3));
54-
return result.AsEnumerableAsync(x.ArgAt<CancellationToken>(3));
54+
return result.AsAsyncEnumerable(x.ArgAt<CancellationToken>(3));
5555
});
5656
_ = client.ExecuteServerEnumerableAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<IAdbSocket>(), Arg.Any<Encoding>(), Arg.Any<CancellationToken>())
5757
.Returns(x =>
@@ -61,7 +61,7 @@ public async Task ExecuteServerCommandAsyncTest()
6161
Assert.Equal(socket, x.ArgAt<IAdbSocket>(2));
6262
Assert.Equal(encoding, x.ArgAt<Encoding>(3));
6363
Assert.Equal(default, x.ArgAt<CancellationToken>(4));
64-
return result.AsEnumerableAsync(x.ArgAt<CancellationToken>(4));
64+
return result.AsAsyncEnumerable(x.ArgAt<CancellationToken>(4));
6565
});
6666

6767
await client.ExecuteServerCommandAsync(target, command, receiver);
@@ -102,7 +102,7 @@ public async Task ExecuteRemoteCommandAsyncTest()
102102
Assert.Equal(device, x.ArgAt<DeviceData>(1));
103103
Assert.Equal(encoding, x.ArgAt<Encoding>(2));
104104
Assert.Equal(default, x.ArgAt<CancellationToken>(3));
105-
return result.AsEnumerableAsync(x.ArgAt<CancellationToken>(3));
105+
return result.AsAsyncEnumerable(x.ArgAt<CancellationToken>(3));
106106
});
107107

108108
await client.ExecuteRemoteCommandAsync(command, device, receiver);

‎AdvancedSharpAdbClient.Tests/Extensions/EnumerableExtensionsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public void AddRangeTest()
4242
public async Task TaskToArrayTest()
4343
{
4444
int[] array = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
45-
Task<IEnumerable<int>> arrayTask = TaskExExtensions.Delay(10).ContinueWith(_ => array.Select(x => x));
46-
IEnumerable<Task<int>> taskArray = array.Select(x => TaskExExtensions.Delay(x).ContinueWith(_ => x));
45+
Task<IEnumerable<int>> arrayTask = Task.Delay(10).ContinueWith(_ => array.Select(x => x));
46+
IEnumerable<Task<int>> taskArray = array.Select(x => Task.Delay(x).ContinueWith(_ => x));
4747
Assert.Equal(array, await taskArray.ToArrayAsync());
4848
Assert.Equal(array, await arrayTask.ToArrayAsync());
4949
}

‎AdvancedSharpAdbClient.Tests/Extensions/ExceptionExtensionsTests.cs‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)