Skip to content

Commit 445fd1b

Browse files
committed
Update tests to pass CancellationToken and fix builder usage
Explicitly pass TestContext.Current.CancellationToken to async database method calls in unit tests for improved reliability. Add null-forgiving operator to _entityMap in integration tests. Update SqlServerContainerFixture to use new MsSqlBuilder constructor with image name.
1 parent 4998fa6 commit 445fd1b

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

src/XpressData.Test/Datalayer/DatabaseConnectionAsyncMockTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task SelectAsync_WithValidQuery_ReturnsSelectQueryResult()
3131
.ReturnsAsync(expectedResult);
3232

3333
// Act
34-
var result = await mockConnection.Object.SelectAsync(query);
34+
var result = await mockConnection.Object.SelectAsync(query, cancellationToken: TestContext.Current.CancellationToken);
3535

3636
// Assert
3737
Assert.NotNull(result);
@@ -84,7 +84,7 @@ public async Task SelectAsync_WithParameters_PassesParametersToConnection()
8484
.ReturnsAsync(expectedResult);
8585

8686
// Act
87-
var result = await mockConnection.Object.SelectAsync(query);
87+
var result = await mockConnection.Object.SelectAsync(query, cancellationToken: TestContext.Current.CancellationToken);
8888

8989
// Assert
9090
Assert.NotNull(result);
@@ -116,7 +116,7 @@ public async Task SelectScalarAsync_WithValidQuery_ReturnsSelectScalarQueryResul
116116
.ReturnsAsync(expectedResult);
117117

118118
// Act
119-
var result = await mockConnection.Object.SelectScalarAsync(query);
119+
var result = await mockConnection.Object.SelectScalarAsync(query, cancellationToken: TestContext.Current.CancellationToken);
120120

121121
// Assert
122122
Assert.NotNull(result);
@@ -146,7 +146,7 @@ public async Task InsertAsync_WithValidQuery_ReturnsInsertQueryResult()
146146
.ReturnsAsync(expectedResult);
147147

148148
// Act
149-
var result = await mockConnection.Object.InsertAsync(query);
149+
var result = await mockConnection.Object.InsertAsync(query, cancellationToken: TestContext.Current.CancellationToken);
150150

151151
// Assert
152152
Assert.NotNull(result);
@@ -177,7 +177,7 @@ public async Task UpdateAsync_WithValidQuery_ReturnsUpdateQueryResult()
177177
.ReturnsAsync(expectedResult);
178178

179179
// Act
180-
var result = await mockConnection.Object.UpdateAsync(query);
180+
var result = await mockConnection.Object.UpdateAsync(query, cancellationToken: TestContext.Current.CancellationToken);
181181

182182
// Assert
183183
Assert.NotNull(result);
@@ -202,7 +202,7 @@ public async Task UpdateAsync_WhenMultipleRowsAffected_ReturnsCorrectCount()
202202
.ReturnsAsync(expectedResult);
203203

204204
// Act
205-
var result = await mockConnection.Object.UpdateAsync(query);
205+
var result = await mockConnection.Object.UpdateAsync(query, cancellationToken: TestContext.Current.CancellationToken);
206206

207207
// Assert
208208
Assert.Equal(5, result.AffectedRows);
@@ -229,7 +229,7 @@ public async Task ExecuteAsync_WithValidQuery_ReturnsExecuteQueryResult()
229229
.ReturnsAsync(expectedResult);
230230

231231
// Act
232-
var result = await mockConnection.Object.ExecuteAsync(query);
232+
var result = await mockConnection.Object.ExecuteAsync(query, cancellationToken: TestContext.Current.CancellationToken);
233233

234234
// Assert
235235
Assert.NotNull(result);
@@ -253,7 +253,7 @@ public async Task ExecuteAsync_WithDDLStatement_ReturnsExecuteQueryResult()
253253
.ReturnsAsync(expectedResult);
254254

255255
// Act
256-
var result = await mockConnection.Object.ExecuteAsync(query);
256+
var result = await mockConnection.Object.ExecuteAsync(query, cancellationToken: TestContext.Current.CancellationToken);
257257

258258
// Assert
259259
Assert.NotNull(result);
@@ -276,7 +276,7 @@ public async Task DeleteDatabaseAsync_WhenCalled_CompletesSuccessfully()
276276
.Returns(Task.CompletedTask);
277277

278278
// Act
279-
await mockConnection.Object.DeleteDatabaseAsync();
279+
await mockConnection.Object.DeleteDatabaseAsync(cancellationToken: TestContext.Current.CancellationToken);
280280

281281
// Assert
282282
mockConnection.Verify(c => c.DeleteDatabaseAsync(It.IsAny<CancellationToken>()), Times.Once);
@@ -364,7 +364,7 @@ public async Task AsyncOperations_WithTransaction_ReturnsTransactionId()
364364

365365
// Act
366366
mockConnection.Object.BeginTransaction();
367-
var result = await mockConnection.Object.SelectAsync(query);
367+
var result = await mockConnection.Object.SelectAsync(query, cancellationToken: TestContext.Current.CancellationToken);
368368

369369
// Assert
370370
Assert.Equal(transactionId, result.TransactionId);

src/XpressData.Test/Integration/EntityMapIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ public async Task Get_WithEqualFilter_ReturnsMatchingEntities()
487487
await InsertTestEntityAsync("OtherName");
488488

489489
// Act
490-
var results = _entityMap.Get(_connection!, filterExpression: NameEquals("TargetName"));
490+
var results = _entityMap!.Get(_connection!, filterExpression: NameEquals("TargetName"));
491491

492492
// Assert
493493
Assert.Single(results);

src/XpressData.Test/Integration/SqlServerContainerFixture.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public class SqlServerContainerFixture : IAsyncLifetime
3131
/// </summary>
3232
public async ValueTask InitializeAsync()
3333
{
34-
_container = new MsSqlBuilder()
35-
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
34+
_container = new MsSqlBuilder("mcr.microsoft.com/mssql/server:2022-latest")
3635
.WithPassword("Strong_Password_123!")
3736
.Build();
3837

0 commit comments

Comments
 (0)