Skip to content

Commit 5eb7eb4

Browse files
joe-harvey-rskjoe-harvey-rsk
committed
fix warnings in tests
1 parent 3f3207c commit 5eb7eb4

4 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎tests/Rsk.Audit.Tests.Integration/EF/AuditWriteTests.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Linq;
2+
using System.Threading.Tasks;
23
using Microsoft.EntityFrameworkCore;
34
using RSK.Audit;
45
using RSK.Audit.EF;
@@ -29,7 +30,7 @@ public AuditWriteTests()
2930
}
3031

3132
[Fact]
32-
public void GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordSuccess_ThenShouldWriteNewAuditEntryInDatabase()
33+
public async Task GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordSuccess_ThenShouldWriteNewAuditEntryInDatabase()
3334
{
3435
var expectedSubject = new UserResourceActor("andy");
3536
const string expectedtedAction = "Login";
@@ -38,7 +39,7 @@ public void GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordSuccess_ThenShoul
3839

3940
var sut = CreateSut();
4041

41-
sut.RecordSuccess(AuditContextMockingHelper.CreateAuditEventContext( expectedSubject,expectedtedAction,expectedResource,expectedDescription)).Wait();
42+
await sut.RecordSuccess(AuditContextMockingHelper.CreateAuditEventContext( expectedSubject,expectedtedAction,expectedResource,expectedDescription));
4243

4344
var auditEntries = databaseContext.AuditEntries.Where(ae => ae.Succeeded &&
4445
ae.SubjectIdentifier == expectedSubject.Identifier &&
@@ -53,7 +54,7 @@ public void GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordSuccess_ThenShoul
5354
}
5455

5556
[Fact]
56-
public void GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordFailure_ThenShouldWriteNewAuditEntryInDatabase()
57+
public async Task GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordFailure_ThenShouldWriteNewAuditEntryInDatabase()
5758
{
5859
var expectedSubject = new UserResourceActor("andy");
5960
const string expectedtedAction = "Login";
@@ -62,7 +63,7 @@ public void GivenIHaveAnAuditSource_WhenAnAttemptIsMadeToRecordFailure_ThenShoul
6263

6364
var sut = CreateSut();
6465

65-
sut.RecordFailure(AuditContextMockingHelper.CreateAuditEventContext(expectedSubject, expectedtedAction, expectedResource,expectedDescription)).Wait();
66+
await sut.RecordFailure(AuditContextMockingHelper.CreateAuditEventContext(expectedSubject, expectedtedAction, expectedResource,expectedDescription));
6667

6768
var auditEntries = databaseContext.AuditEntries.Where(ae => !ae.Succeeded &&
6869
ae.SubjectIdentifier == expectedSubject.Identifier &&

‎tests/Rsk.Audit.Tests/EF/AuditQueryTests.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Threading.Tasks;
45
using Moq;
56
using RSK.Audit.EF;
67
using Rsk.Audit.Tests;
@@ -238,11 +239,11 @@ public void AndFailed_WhenCalled_ShouldAddToCriteria()
238239

239240

240241
[Fact]
241-
public void ExecuteAscending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCount()
242+
public async Task ExecuteAscending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCount()
242243
{
243244
var entities = SetupFindSuccessEntities();
244245

245-
var result = CreateSut().ExecuteAscending().Result;
246+
var result = await CreateSut().ExecuteAscending();
246247

247248
var expectedResultSet = entities.Where(ae => ae.Succeeded).ToList();
248249

@@ -252,11 +253,11 @@ public void ExecuteAscending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCoun
252253

253254

254255
[Fact]
255-
public void ExecuteDescending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCount()
256+
public async Task ExecuteDescending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCount()
256257
{
257258
var entities = SetupFindSuccessEntities();
258259

259-
var result = CreateSut().ExecuteDescending().Result;
260+
var result = await CreateSut().ExecuteDescending();
260261

261262
var expectedResultSet = entities.Where(ae => ae.Succeeded).Reverse().ToList();
262263

@@ -266,13 +267,13 @@ public void ExecuteDescending_WhenCalled_ShouldReturnAllSuccessfullRecordsAndCou
266267

267268

268269
[Fact]
269-
public void ExecuteAscending_WhenCalled_ShouldReturnAllRecordsSortedBySource()
270+
public async Task ExecuteAscending_WhenCalled_ShouldReturnAllRecordsSortedBySource()
270271
{
271272
var entities = CreateAuditEntities();
272273

273274
baseQuery = entities.AsQueryable();
274275

275-
var result = CreateSut().ExecuteAscending(AuditQuerySort.Source).Result;
276+
var result = await CreateSut().ExecuteAscending(AuditQuerySort.Source);
276277

277278
var expectedResultSet = entities.OrderBy(ae => ae.Source).ToList();
278279

@@ -285,7 +286,7 @@ public void ExecuteAscending_WhenCalled_ShouldReturnAllRecordsSortedBySource()
285286
[InlineData(1)]
286287
[InlineData(2)]
287288
[InlineData(3)]
288-
public void ExecuteAscending_WhenPagingEnabled_ShouldReturnResultsPaged(int page)
289+
public async Task ExecuteAscending_WhenPagingEnabled_ShouldReturnResultsPaged(int page)
289290
{
290291
const int rowsPerPage = 2;
291292

@@ -295,7 +296,7 @@ public void ExecuteAscending_WhenPagingEnabled_ShouldReturnResultsPaged(int page
295296

296297
var sut = new AuditQueryWithPaging(baseQuery,page,rowsPerPage);
297298

298-
var results = sut.ExecuteAscending().Result;
299+
var results = await sut.ExecuteAscending();
299300

300301
var expectedQuery = entities.OrderBy(ae => ae.When);
301302
var expectedCount = expectedQuery.Count();

‎tests/Rsk.Audit.Tests/EF/AuditRecorderTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,20 @@ public void RecordFailure_WhenCalled_ShouldAddFailureRecordForSource()
5757
}
5858

5959
[Fact]
60-
public void RecordSuccess_WhenCalledAndFails_ShouldThrowAuditWriteException()
60+
public async Task RecordSuccess_WhenCalledAndFails_ShouldThrowAuditWriteException()
6161
{
6262
auditEntities.Setup(ae => ae.Add(It.IsAny<AuditEntity>()))
6363
.Throws(new Exception("Blah"));
6464

6565
var sut = CreateSut();
6666

67-
Assert.ThrowsAsync<AuditWriteException>(() =>
67+
await Assert.ThrowsAsync<AuditWriteException>(() =>
6868
sut.RecordSuccess(AuditContextMockingHelper.CreateAuditEventContext(
6969

7070
new UserResourceActor(fixture.Create<string>()),
7171
fixture.Create<string>(),
7272
new AuditableResource(fixture.Create<string>()),
73-
fixture.Create<string>()))).Wait();
73+
fixture.Create<string>())));
7474
}
7575

7676
private void RecordAction( Func<AuditRecorder,Func<IAuditEventArguments,Task>> recordMethodFactory , bool isSuccess)

‎tests/Rsk.Audit.Tests/RecordLocalizedAuditableActionsTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading.Tasks;
23
using Microsoft.Extensions.Localization;
34
using Moq;
45
using Rsk.Audit.Tests;
@@ -34,7 +35,7 @@ public void ctor_WithNullLocalizer_ShouldThrowArgumentNullException()
3435
}
3536

3637
[Fact]
37-
public void RecordSuccess_WhenCalled_ShouldLocalizeActionAndForward()
38+
public async Task RecordSuccess_WhenCalled_ShouldLocalizeActionAndForward()
3839
{
3940
var expectedSubject = new UserResourceActor( "fred");
4041
var expectedResource = new AuditableResource("identityServer");
@@ -49,15 +50,15 @@ public void RecordSuccess_WhenCalled_ShouldLocalizeActionAndForward()
4950

5051
IAuditEventArguments auditEventContext =
5152
AuditContextMockingHelper.CreateAuditEventContext(expectedSubject, actionKey, expectedResource, "");
52-
sut.RecordSuccess(auditEventContext).Wait();
53+
await sut.RecordSuccess(auditEventContext);
5354

5455
recordAuditableActions.Verify(
5556
raa => raa.RecordSuccess(It.Is<IAuditEventArguments>(aec => aec.Action == expectedTranslationText)),
5657
Times.Once);
5758
}
5859

5960
[Fact]
60-
public void RecordFailure_WhenCalled_ShouldLocalizeActionAndForward()
61+
public async Task RecordFailure_WhenCalled_ShouldLocalizeActionAndForward()
6162
{
6263
var expectedSubject = new UserResourceActor("fred");
6364
var expectedResource = new AuditableResource("identityServer");
@@ -72,15 +73,15 @@ public void RecordFailure_WhenCalled_ShouldLocalizeActionAndForward()
7273

7374
IAuditEventArguments auditEventContext =
7475
AuditContextMockingHelper.CreateAuditEventContext(expectedSubject, actionKey, expectedResource, "");
75-
sut.RecordFailure(auditEventContext).Wait();
76+
await sut.RecordFailure(auditEventContext);
7677

7778
recordAuditableActions.Verify(
7879
raa => raa.RecordFailure(It.Is<IAuditEventArguments>(aec => aec.Action == expectedTranslationText)),Times.Once);
7980
}
8081

8182

8283
[Fact]
83-
public void RecordFailure_WhenCalled_ShouldLocalizeActionContext()
84+
public async Task RecordFailure_WhenCalled_ShouldLocalizeActionContext()
8485
{
8586
var expectedSubject = new UserResourceActor("fred");
8687
var expectedResource = new AuditableResource("identityServer");
@@ -93,7 +94,7 @@ public void RecordFailure_WhenCalled_ShouldLocalizeActionContext()
9394

9495
IAuditEventArguments auditEventContext =
9596
AuditContextMockingHelper.CreateAuditEventContext(expectedSubject, action, expectedResource, "");
96-
sut.RecordSuccess(auditEventContext).Wait();
97+
await sut.RecordSuccess(auditEventContext);
9798

9899
recordAuditableActions.Verify(raa => raa.RecordSuccess(It.IsAny<LocalizedAuditEventArguments>()), Times.Once);
99100
}

0 commit comments

Comments
 (0)