Skip to content

Commit ffefa55

Browse files
committed
Renamed Task.ResultOrDefault extensions
1 parent 445d7a5 commit ffefa55

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Microsoft.Toolkit.Uwp.UI/Converters/TaskResultConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public object Convert(object value, Type targetType, object parameter, string la
2424
{
2525
if (value is Task task)
2626
{
27-
return task.ResultOrDefault();
27+
return task.GetResultOrDefault();
2828
}
2929

3030
return null;

Microsoft.Toolkit/Extensions/TaskExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static class TaskExtensions
3030
/// </remarks>
3131
[Pure]
3232
[MethodImpl(MethodImplOptions.AggressiveInlining)]
33-
public static object? ResultOrDefault(this Task task)
33+
public static object? GetResultOrDefault(this Task task)
3434
{
3535
// Check if the instance is a completed Task
3636
if (
@@ -78,7 +78,7 @@ public static class TaskExtensions
7878
[Pure]
7979
[MethodImpl(MethodImplOptions.AggressiveInlining)]
8080
[return: MaybeNull]
81-
public static T ResultOrDefault<T>(this Task<T> task)
81+
public static T GetResultOrDefault<T>(this Task<T> task)
8282
{
8383
#if NETSTANDARD2_1
8484
return task.IsCompletedSuccessfully ? task.Result : default;

UnitTests/UnitTests.Shared/Extensions/Test_TaskExtensions.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ public void Test_TaskExtensions_ResultOrDefault()
1818
{
1919
TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
2020

21-
Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
21+
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
2222

2323
tcs.SetCanceled();
2424

25-
Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
25+
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
2626

2727
tcs = new TaskCompletionSource<int>();
2828

2929
tcs.SetException(new InvalidOperationException("Test"));
3030

31-
Assert.AreEqual(null, ((Task)tcs.Task).ResultOrDefault());
31+
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
3232

3333
tcs = new TaskCompletionSource<int>();
3434

3535
tcs.SetResult(42);
3636

37-
Assert.AreEqual(42, ((Task)tcs.Task).ResultOrDefault());
37+
Assert.AreEqual(42, ((Task)tcs.Task).GetResultOrDefault());
3838
}
3939

4040
[TestCategory("TaskExtensions")]
@@ -43,23 +43,23 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_Int32()
4343
{
4444
TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
4545

46-
Assert.AreEqual(0, tcs.Task.ResultOrDefault());
46+
Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
4747

4848
tcs.SetCanceled();
4949

50-
Assert.AreEqual(0, tcs.Task.ResultOrDefault());
50+
Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
5151

5252
tcs = new TaskCompletionSource<int>();
5353

5454
tcs.SetException(new InvalidOperationException("Test"));
5555

56-
Assert.AreEqual(0, tcs.Task.ResultOrDefault());
56+
Assert.AreEqual(0, tcs.Task.GetResultOrDefault());
5757

5858
tcs = new TaskCompletionSource<int>();
5959

6060
tcs.SetResult(42);
6161

62-
Assert.AreEqual(42, tcs.Task.ResultOrDefault());
62+
Assert.AreEqual(42, tcs.Task.GetResultOrDefault());
6363
}
6464

6565
[TestCategory("TaskExtensions")]
@@ -68,23 +68,23 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_String()
6868
{
6969
TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();
7070

71-
Assert.AreEqual(null, tcs.Task.ResultOrDefault());
71+
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
7272

7373
tcs.SetCanceled();
7474

75-
Assert.AreEqual(null, tcs.Task.ResultOrDefault());
75+
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
7676

7777
tcs = new TaskCompletionSource<string>();
7878

7979
tcs.SetException(new InvalidOperationException("Test"));
8080

81-
Assert.AreEqual(null, tcs.Task.ResultOrDefault());
81+
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
8282

8383
tcs = new TaskCompletionSource<string>();
8484

8585
tcs.SetResult("Hello world");
8686

87-
Assert.AreEqual("Hello world", tcs.Task.ResultOrDefault());
87+
Assert.AreEqual("Hello world", tcs.Task.GetResultOrDefault());
8888
}
8989
}
9090
}

0 commit comments

Comments
 (0)