Skip to content

Commit 9a7bb9b

Browse files
MrMatthewLaytonMrMatthewLayton
committed
Fixed all build warnings, and minor improvements to GitHub Actions script to improve build performance.
1 parent 4c532de commit 9a7bb9b

File tree

4 files changed

+65
-56
lines changed

4 files changed

+65
-56
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111

1212
env:
1313
USE_FULL_NUMERIC_PROVIDER: "true"
14-
MSBUILDDISABLENODEREUSE: "1" # Disable MSBuild node reuse to prevent hang
1514

1615
jobs:
1716
build:
@@ -28,9 +27,5 @@ jobs:
2827
run: dotnet restore
2928
- name: Build
3029
run: dotnet build --no-restore
31-
- name: Test (.NET 8.0)
32-
run: dotnet test --no-build --framework net8.0 --verbosity quiet
33-
- name: Test (.NET 9.0)
34-
run: dotnet test --no-build --framework net9.0 --verbosity quiet
35-
- name: Test (.NET 10.0)
36-
run: dotnet test --no-build --framework net10.0 --verbosity quiet
30+
- name: Test
31+
run: dotnet test --no-build --verbosity quiet

‎OnixLabs.Core.UnitTests/ObjectExtensionTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public async Task ToOptionalAsyncShouldProduceExpectedResultWhenUsingNonNullRefe
327327
const string expected = "abc";
328328

329329
// When
330-
Optional<string> optional = await Task.FromResult<string?>(expected).ToOptionalAsync();
330+
Optional<string> optional = await Task.FromResult<string?>(expected).ToOptionalAsync(token: TestContext.Current.CancellationToken);
331331

332332
// Then
333333
Some<string> some = Assert.IsType<Some<string>>(optional);
@@ -341,7 +341,7 @@ public async Task ToOptionalAsyncShouldProduceExpectedResultWhenUsingNullReferen
341341
const string? expected = null;
342342

343343
// When
344-
Optional<string> optional = await Task.FromResult(expected).ToOptionalAsync();
344+
Optional<string> optional = await Task.FromResult(expected).ToOptionalAsync(token: TestContext.Current.CancellationToken);
345345

346346
// Then
347347
Assert.IsType<None<string>>(optional);
@@ -354,7 +354,7 @@ public async Task ToOptionalAsyncShouldProduceExpectedResultWhenUsingNonNullValu
354354
const int expected = 123;
355355

356356
// When
357-
Optional<int> optional = await Task.FromResult(expected).ToOptionalAsync();
357+
Optional<int> optional = await Task.FromResult(expected).ToOptionalAsync(token: TestContext.Current.CancellationToken);
358358

359359
// Then
360360
Some<int> some = Assert.IsType<Some<int>>(optional);
@@ -368,7 +368,7 @@ public async Task ToOptionalAsyncShouldProduceExpectedResultWhenUsingNullValueTy
368368
int? expected = null;
369369

370370
// When
371-
Optional<int> optional = await Task.FromResult(expected).ToOptionalAsync();
371+
Optional<int> optional = await Task.FromResult(expected).ToOptionalAsync(token: TestContext.Current.CancellationToken);
372372

373373
// Then
374374
Assert.IsType<None<int>>(optional);
@@ -396,7 +396,7 @@ public async Task ToSuccessAsyncShouldProduceTheExpectedResult()
396396

397397
// When
398398
Task<string> task = Task.FromResult(expected);
399-
Result<string> result = await task.ToSuccessAsync();
399+
Result<string> result = await task.ToSuccessAsync(token: TestContext.Current.CancellationToken);
400400

401401
// Then
402402
Success<string> success = Assert.IsType<Success<string>>(result);

‎OnixLabs.Core.UnitTests/ResultGenericTests.cs‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void ResultOfShouldProduceExpectedFailureResult()
7070
public async Task ResultOfAsyncShouldProduceExpectedSuccessResult()
7171
{
7272
// Given / When
73-
Result<int> result = await Result<int>.OfAsync(async () => await Task.FromResult(1));
73+
Result<int> result = await Result<int>.OfAsync(async () => await Task.FromResult(1), TestContext.Current.CancellationToken);
7474

7575
// Then
7676
Assert.IsType<Success<int>>(result);
@@ -80,7 +80,7 @@ public async Task ResultOfAsyncShouldProduceExpectedSuccessResult()
8080
public async Task ResultOfAsyncShouldProduceExpectedFailureResult()
8181
{
8282
// Given / When
83-
Result<int> result = await Result<int>.OfAsync(async () => await Task.FromException<int>(FailureException));
83+
Result<int> result = await Result<int>.OfAsync(async () => await Task.FromException<int>(FailureException), TestContext.Current.CancellationToken);
8484

8585
// Then
8686
Assert.IsType<Failure<int>>(result);
@@ -418,7 +418,8 @@ await result.MatchAsync(
418418
isSuccess = true;
419419
return Task.CompletedTask;
420420
},
421-
failure: _ => isFailure = true
421+
failure: _ => isFailure = true,
422+
token: TestContext.Current.CancellationToken
422423
);
423424

424425
// Then
@@ -441,7 +442,8 @@ await result.MatchAsync(
441442
isSuccess = true;
442443
return Task.CompletedTask;
443444
},
444-
failure: _ => isFailure = true
445+
failure: _ => isFailure = true,
446+
token: TestContext.Current.CancellationToken
445447
);
446448

447449
// Then
@@ -514,7 +516,8 @@ await result.MatchAsync(
514516
{
515517
isFailure = true;
516518
return Task.CompletedTask;
517-
}
519+
},
520+
token: TestContext.Current.CancellationToken
518521
);
519522

520523
// Then
@@ -537,7 +540,8 @@ await result.MatchAsync(
537540
{
538541
isFailure = true;
539542
return Task.CompletedTask;
540-
}
543+
},
544+
token: TestContext.Current.CancellationToken
541545
);
542546

543547
// Then
@@ -755,7 +759,8 @@ public async Task ResultMatchAsyncFuncTTaskTResultFuncExceptionTResultFromSucces
755759
// When
756760
int actual = await result.MatchAsync(
757761
success: _ => Task.FromResult(1),
758-
failure: _ => 0
762+
failure: _ => 0,
763+
token: TestContext.Current.CancellationToken
759764
);
760765

761766
// Then
@@ -772,7 +777,8 @@ public async Task ResultMatchAsyncFuncTTaskTResultFuncExceptionTResultFromFailur
772777
// When
773778
int actual = await result.MatchAsync(
774779
success: _ => Task.FromResult(0),
775-
failure: _ => 1
780+
failure: _ => 1,
781+
token: TestContext.Current.CancellationToken
776782
);
777783

778784
// Then
@@ -827,7 +833,8 @@ public async Task ResultMatchAsyncFuncTResultFuncExceptionTaskTResultFromSuccess
827833
// When
828834
int actual = await result.MatchAsync(
829835
success: _ => 1,
830-
failure: _ => Task.FromResult(0)
836+
failure: _ => Task.FromResult(0),
837+
token: TestContext.Current.CancellationToken
831838
);
832839

833840
// Then
@@ -844,7 +851,8 @@ public async Task ResultMatchAsyncFuncTResultFuncExceptionTaskTResultFromFailure
844851
// When
845852
int actual = await result.MatchAsync(
846853
success: _ => 0,
847-
failure: _ => Task.FromResult(1)
854+
failure: _ => Task.FromResult(1),
855+
token: TestContext.Current.CancellationToken
848856
);
849857

850858
// Then
@@ -1015,7 +1023,7 @@ public async Task ResultSelectAsyncFuncTTaskFromFailureShouldProduceExpectedResu
10151023
Result expected = Result.Failure(FailureException);
10161024

10171025
// When
1018-
Result actual = await result.SelectAsync(_ => Task.CompletedTask);
1026+
Result actual = await result.SelectAsync(_ => Task.CompletedTask, TestContext.Current.CancellationToken);
10191027

10201028
// Then
10211029
Assert.Equal(expected, actual);
@@ -1029,7 +1037,7 @@ public async Task ResultSelectAsyncFuncTTaskFromSuccessShouldProduceExpectedResu
10291037
Result expected = Result.Success();
10301038

10311039
// When
1032-
Result actual = await result.SelectAsync(_ => Task.CompletedTask);
1040+
Result actual = await result.SelectAsync(_ => Task.CompletedTask, TestContext.Current.CancellationToken);
10331041

10341042
// Then
10351043
Assert.Equal(expected, actual);
@@ -1043,7 +1051,7 @@ public async Task ResultSelectAsyncFuncTTaskFromSuccessWithExceptionShouldProduc
10431051
Result expected = Result.Failure(FailureException);
10441052

10451053
// When
1046-
Result actual = await result.SelectAsync(_ => throw FailureException);
1054+
Result actual = await result.SelectAsync(_ => throw FailureException, TestContext.Current.CancellationToken);
10471055

10481056
// Then
10491057
Assert.Equal(expected, actual);
@@ -1144,7 +1152,7 @@ public async Task ResultSelectAsyncFunctionOfTResultFromFailureShouldProduceExpe
11441152
Result<int> expected = Result<int>.Failure(FailureException);
11451153

11461154
// When
1147-
Result<int> actual = await result.SelectAsync(_ => Task.FromResult(1));
1155+
Result<int> actual = await result.SelectAsync(_ => Task.FromResult(1), TestContext.Current.CancellationToken);
11481156

11491157
// Then
11501158
Assert.Equal(expected, actual);
@@ -1158,7 +1166,7 @@ public async Task ResultSelectAsyncFunctionOfTResultFromSuccessShouldProduceExpe
11581166
Result<int> expected = Result<int>.Success(1);
11591167

11601168
// When
1161-
Result<int> actual = await result.SelectAsync(_ => Task.FromResult(1));
1169+
Result<int> actual = await result.SelectAsync(_ => Task.FromResult(1), TestContext.Current.CancellationToken);
11621170

11631171
// Then
11641172
Assert.Equal(expected, actual);
@@ -1172,7 +1180,7 @@ public async Task ResultSelectAsyncFunctionOfTResultFromSuccessWithExceptionShou
11721180
Result<int> expected = Result<int>.Failure(FailureException);
11731181

11741182
// When
1175-
Result<int> actual = await result.SelectAsync<int>(_ => throw FailureException);
1183+
Result<int> actual = await result.SelectAsync<int>(_ => throw FailureException, TestContext.Current.CancellationToken);
11761184

11771185
// Then
11781186
Assert.Equal(expected, actual);
@@ -1273,7 +1281,8 @@ public async Task ResultSelectManyAsyncFunctionFromFailureShouldProduceExpectedR
12731281
Result expected = Result.Failure(FailureException);
12741282

12751283
// When
1276-
Result actual = await result.SelectManyAsync(async _ => await Task.FromResult(Result.Success()));
1284+
Result actual = await result.SelectManyAsync(async _ =>
1285+
await Task.FromResult(Result.Success()), TestContext.Current.CancellationToken);
12771286

12781287
// Then
12791288
Assert.Equal(expected, actual);
@@ -1287,7 +1296,8 @@ public async Task ResultSelectManyAsyncFunctionFromSuccessShouldProduceExpectedR
12871296
Result expected = Result.Success();
12881297

12891298
// When
1290-
Result actual = await result.SelectManyAsync(async _ => await Task.FromResult(Result.Success()));
1299+
Result actual = await result.SelectManyAsync(async _ =>
1300+
await Task.FromResult(Result.Success()), TestContext.Current.CancellationToken);
12911301

12921302
// Then
12931303
Assert.Equal(expected, actual);
@@ -1301,7 +1311,7 @@ public async Task ResultSelectManyAsyncFunctionFromSuccessWithExceptionShouldPro
13011311
Result expected = Result.Failure(FailureException);
13021312

13031313
// When
1304-
Result actual = await result.SelectManyAsync(_ => throw FailureException);
1314+
Result actual = await result.SelectManyAsync(_ => throw FailureException, TestContext.Current.CancellationToken);
13051315

13061316
// Then
13071317
Assert.Equal(expected, actual);
@@ -1402,7 +1412,8 @@ public async Task ResultSelectManyAsyncFunctionOfTResultFromFailureShouldProduce
14021412
Result<int> expected = Result<int>.Failure(FailureException);
14031413

14041414
// When
1405-
Result<int> actual = await result.SelectManyAsync<int>(async _ => await Task.FromResult(Result<int>.Success(1)));
1415+
Result<int> actual = await result.SelectManyAsync<int>(async _ =>
1416+
await Task.FromResult(Result<int>.Success(1)), TestContext.Current.CancellationToken);
14061417

14071418
// Then
14081419
Assert.Equal(expected, actual);
@@ -1416,7 +1427,8 @@ public async Task ResultSelectManyAsyncFunctionOfTResultFromSuccessShouldProduce
14161427
Result<int> expected = Result<int>.Success(1);
14171428

14181429
// When
1419-
Result<int> actual = await result.SelectManyAsync<int>(async _ => await Task.FromResult(Result<int>.Success(1)));
1430+
Result<int> actual = await result.SelectManyAsync<int>(async _ =>
1431+
await Task.FromResult(Result<int>.Success(1)), TestContext.Current.CancellationToken);
14201432

14211433
// Then
14221434
Assert.Equal(expected, actual);
@@ -1430,7 +1442,7 @@ public async Task ResultSelectManyAsyncFunctionOfTResultFromSuccessWithException
14301442
Result<int> expected = Result<int>.Failure(FailureException);
14311443

14321444
// When
1433-
Result<int> actual = await result.SelectManyAsync<int>(_ => throw FailureException);
1445+
Result<int> actual = await result.SelectManyAsync<int>(_ => throw FailureException, TestContext.Current.CancellationToken);
14341446

14351447
// Then
14361448
Assert.Equal(expected, actual);

0 commit comments

Comments
 (0)