Skip to content

Commit 6bbc328

Browse files
pwelter34pwelter34
committed
update tests
1 parent c2592d6 commit 6bbc328

File tree

13 files changed

+131
-130
lines changed

13 files changed

+131
-130
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<PackageVersion Include="Testcontainers.Postgresql" Version="4.7.0" />
3939
<PackageVersion Include="Testcontainers.Redis" Version="4.7.0" />
4040
<PackageVersion Include="Verify.XunitV3" Version="31.0.1" />
41-
<PackageVersion Include="XUnit.Hosting" Version="3.0.1" />
41+
<PackageVersion Include="XUnit.Hosting" Version="3.0.2" />
4242
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4343
<PackageVersion Include="xunit.v3" Version="3.1.0" />
4444
</ItemGroup>

‎test/FluentCommand.PostgreSQL.Tests/DataCommandSqlAsyncTests.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityAsync()
4141
Updated = r.GetDateTimeOffset("Updated"),
4242
UpdatedBy = r.GetString("UpdatedBy"),
4343
RowVersion = r.GetBytes("RowVersion"),
44-
}, cancellationToken: Xunit.TestContext.Current.CancellationToken);
44+
}, cancellationToken: TestCancellation);
4545

4646
user.Should().NotBeNull();
4747
user.EmailAddress.Should().Be(email);
@@ -58,7 +58,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityFactoryAsync()
5858

5959
var user = await session.Sql(sql)
6060
.Parameter("@EmailAddress", email)
61-
.QuerySingleAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
61+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
6262

6363
user.Should().NotBeNull();
6464
user.EmailAddress.Should().Be(email);
@@ -76,15 +76,15 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityFactoryCacheAsync()
7676
var user = await session.Sql(sql)
7777
.Parameter("@EmailAddress", email)
7878
.UseCache(TimeSpan.FromMinutes(5))
79-
.QuerySingleAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
79+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
8080

8181
user.Should().NotBeNull();
8282
user.EmailAddress.Should().Be(email);
8383

8484
var cachedUser = await session.Sql(sql)
8585
.Parameter("@EmailAddress", email)
8686
.UseCache(TimeSpan.FromMinutes(5))
87-
.QuerySingleAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
87+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
8888

8989
cachedUser.Should().NotBeNull();
9090
cachedUser.EmailAddress.Should().Be(email);
@@ -102,7 +102,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityDynamicAsync()
102102

103103
dynamic user = await session.Sql(sql)
104104
.Parameter("@EmailAddress", email)
105-
.QuerySingleAsync(cancellationToken: Xunit.TestContext.Current.CancellationToken);
105+
.QuerySingleAsync(cancellationToken: TestCancellation);
106106

107107
Assert.NotNull(user);
108108
Assert.Equal(user.EmailAddress, email);
@@ -138,7 +138,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityAsync()
138138
Updated = r.GetDateTimeOffset("Updated"),
139139
UpdatedBy = r.GetString("UpdatedBy"),
140140
RowVersion = r.GetBytes("RowVersion"),
141-
}, cancellationToken: Xunit.TestContext.Current.CancellationToken);
141+
}, cancellationToken: TestCancellation);
142142

143143
users.Should().NotBeNull();
144144
users.Should().NotBeEmpty();
@@ -155,7 +155,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicAsync()
155155

156156
IEnumerable<dynamic> users = await session.Sql(sql)
157157
.Parameter("@EmailAddress", email)
158-
.QueryAsync(cancellationToken: Xunit.TestContext.Current.CancellationToken);
158+
.QueryAsync(cancellationToken: TestCancellation);
159159

160160
users.Should().NotBeNull();
161161
users.Should().NotBeEmpty();
@@ -174,7 +174,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicCacheAsync()
174174
.Sql(sql)
175175
.Parameter("@EmailAddress", email)
176176
.UseCache(TimeSpan.FromMinutes(5))
177-
.QueryAsync(cancellationToken: Xunit.TestContext.Current.CancellationToken);
177+
.QueryAsync(cancellationToken: TestCancellation);
178178

179179
var userList = users.ToList();
180180

@@ -185,7 +185,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicCacheAsync()
185185
.Sql(sql)
186186
.Parameter("@EmailAddress", email)
187187
.UseCache(TimeSpan.FromMinutes(5))
188-
.QueryAsync(cancellationToken: Xunit.TestContext.Current.CancellationToken);
188+
.QueryAsync(cancellationToken: TestCancellation);
189189

190190
var cachedList = cachedUsers.ToList();
191191

@@ -204,7 +204,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityFactoryAsync()
204204

205205
var users = await session.Sql(sql)
206206
.Parameter("@EmailAddress", email)
207-
.QueryAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
207+
.QueryAsync<User>(cancellationToken: TestCancellation);
208208

209209
users.Should().NotBeNull();
210210
users.Should().NotBeEmpty();
@@ -221,7 +221,7 @@ public async System.Threading.Tasks.Task SqlQueryTableAsync()
221221

222222
var users = await session.Sql(sql)
223223
.Parameter("@EmailAddress", email)
224-
.QueryTableAsync(Xunit.TestContext.Current.CancellationToken);
224+
.QueryTableAsync(TestCancellation);
225225

226226
users.Should().NotBeNull();
227227
}
@@ -237,7 +237,7 @@ public async System.Threading.Tasks.Task SqlQueryValueAsync()
237237

238238
var count = await session.Sql(sql)
239239
.Parameter("@EmailAddress", email)
240-
.QueryValueAsync<int>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
240+
.QueryValueAsync<int>(cancellationToken: TestCancellation);
241241

242242
count.Should().BeGreaterThan(0);
243243
}
@@ -264,7 +264,7 @@ await session.Sql(sql)
264264
}
265265

266266
return System.Threading.Tasks.Task.CompletedTask;
267-
}, cancellationToken: Xunit.TestContext.Current.CancellationToken);
267+
}, cancellationToken: TestCancellation);
268268

269269
users.Should().NotBeNull();
270270
users.Should().NotBeEmpty();
@@ -290,10 +290,10 @@ await session.Sql(sql)
290290
.Parameter("@EmailAddress", email)
291291
.QueryMultipleAsync(async q =>
292292
{
293-
user = await q.QuerySingleAsync<User>();
294-
roles = (await q.QueryAsync<Role>()).ToList();
295-
priorities = (await q.QueryAsync<Priority>()).ToList();
296-
}, Xunit.TestContext.Current.CancellationToken);
293+
user = await q.QuerySingleAsync<User>(cancellationToken: TestCancellation);
294+
roles = (await q.QueryAsync<Role>(cancellationToken: TestCancellation)).ToList();
295+
priorities = (await q.QueryAsync<Priority>(cancellationToken: TestCancellation)).ToList();
296+
}, TestCancellation);
297297
}
298298

299299
user.Should().NotBeNull();

‎test/FluentCommand.PostgreSQL.Tests/DataQueryTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityAsync()
4747
Updated = r.GetDateTimeOffset("Updated"),
4848
UpdatedBy = r.GetString("UpdatedBy"),
4949
RowVersion = r.GetBytes("RowVersion"),
50-
}, cancellationToken: Xunit.TestContext.Current.CancellationToken);
50+
}, cancellationToken: TestCancellation);
5151

5252
user.Should().NotBeNull();
5353
user.EmailAddress.Should().Be(email);
@@ -72,7 +72,7 @@ public async System.Threading.Tasks.Task SqlQueryFilterAsync()
7272
.OrderBy(p => p.Updated)
7373
.Limit(0, 10)
7474
)
75-
.QueryAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
75+
.QueryAsync<User>(cancellationToken: TestCancellation);
7676

7777
users.Should().NotBeNull();
7878
}
@@ -104,7 +104,7 @@ public async System.Threading.Tasks.Task SqlQueryJoinAsync()
104104
.OrderBy(p => p.Updated, "r")
105105
.Limit(0, 10)
106106
)
107-
.QueryAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
107+
.QueryAsync<User>(cancellationToken: TestCancellation);
108108

109109
users.Should().NotBeNull();
110110
}
@@ -123,7 +123,7 @@ public async System.Threading.Tasks.Task SqlQueryCountAsync()
123123
.Count()
124124
.Where(p => p.EmailAddress, email)
125125
)
126-
.QueryValueAsync<int>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
126+
.QueryValueAsync<int>(cancellationToken: TestCancellation);
127127

128128
count.Should().Be(1);
129129
}
@@ -140,7 +140,7 @@ public async System.Threading.Tasks.Task SqlQuerySumAsync()
140140
.Aggregate(p => p.DisplayOrder, AggregateFunctions.Sum)
141141
.GroupBy(p => p.IsActive)
142142
)
143-
.QueryValueAsync<int>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
143+
.QueryValueAsync<int>(cancellationToken: TestCancellation);
144144

145145
count.Should().BeGreaterThan(1);
146146
}
@@ -156,7 +156,7 @@ public async System.Threading.Tasks.Task SqlQueryValuesAsync()
156156
.Select<Status>()
157157
.Column(p => p.Id)
158158
)
159-
.QueryValuesAsync<int>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
159+
.QueryValuesAsync<int>(cancellationToken: TestCancellation);
160160

161161
ids.Should().NotBeEmpty();
162162
}
@@ -175,7 +175,7 @@ public async System.Threading.Tasks.Task SqlQueryInEntityAsync()
175175
.WhereIn(p => p.Id, values)
176176
.Tag()
177177
)
178-
.QueryAsync<Status>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
178+
.QueryAsync<Status>(cancellationToken: TestCancellation);
179179

180180
results.Should().NotBeNull();
181181

@@ -202,7 +202,7 @@ public async System.Threading.Tasks.Task SqlInsertValueQuery()
202202
.Output(p => p.Id)
203203
.Tag()
204204
)
205-
.QueryValueAsync<Guid>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
205+
.QueryValueAsync<Guid>(cancellationToken: TestCancellation);
206206

207207
userId.Should().Be(id);
208208
}
@@ -232,7 +232,7 @@ public async System.Threading.Tasks.Task SqlInsertEntityQuery()
232232
.Output(p => p.Id)
233233
.Tag()
234234
)
235-
.QueryValueAsync<Guid>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
235+
.QueryValueAsync<Guid>(cancellationToken: TestCancellation);
236236

237237
userId.Should().Be(id);
238238
}
@@ -262,7 +262,7 @@ public async System.Threading.Tasks.Task SqlInsertUpdateDeleteEntityQuery()
262262
.Output(p => p.Id)
263263
.Tag()
264264
)
265-
.QueryValueAsync<Guid>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
265+
.QueryValueAsync<Guid>(cancellationToken: TestCancellation);
266266

267267
userId.Should().Be(id);
268268

@@ -272,7 +272,7 @@ public async System.Threading.Tasks.Task SqlInsertUpdateDeleteEntityQuery()
272272
.Where(p => p.Id, id)
273273
.Tag()
274274
)
275-
.QuerySingleAsync<User>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
275+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
276276

277277
selected.Should().NotBeNull();
278278
selected.Id.Should().Be(id);
@@ -285,7 +285,7 @@ public async System.Threading.Tasks.Task SqlInsertUpdateDeleteEntityQuery()
285285
.Where(p => p.Id, id)
286286
.Tag()
287287
)
288-
.QueryValueAsync<Guid>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
288+
.QueryValueAsync<Guid>(cancellationToken: TestCancellation);
289289

290290
updateId.Should().Be(id);
291291

@@ -296,7 +296,7 @@ public async System.Threading.Tasks.Task SqlInsertUpdateDeleteEntityQuery()
296296
.Where(p => p.Id, id)
297297
.Tag()
298298
)
299-
.QueryValueAsync<Guid>(cancellationToken: Xunit.TestContext.Current.CancellationToken);
299+
.QueryValueAsync<Guid>(cancellationToken: TestCancellation);
300300

301301
deleteId.Should().Be(id);
302302

‎test/FluentCommand.SQLite.Tests/DataCommandSqlAsyncTests.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityAsync()
4242
Updated = r.GetDateTimeOffset("Updated"),
4343
UpdatedBy = r.GetString("UpdatedBy"),
4444
RowVersion = r.GetBytes("RowVersion"),
45-
});
45+
}, cancellationToken: TestCancellation);
4646

4747
user.Should().NotBeNull();
4848
user.EmailAddress.Should().Be(email);
@@ -60,7 +60,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityFactoryAsync()
6060
var user = await session
6161
.Sql(sql)
6262
.Parameter("@EmailAddress", email)
63-
.QuerySingleAsync<User>();
63+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
6464

6565
user.Should().NotBeNull();
6666
user.EmailAddress.Should().Be(email);
@@ -79,7 +79,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityFactoryCacheAsync()
7979
.Sql(sql)
8080
.Parameter("@EmailAddress", email)
8181
.UseCache(TimeSpan.FromMinutes(5))
82-
.QuerySingleAsync<User>();
82+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
8383

8484
user.Should().NotBeNull();
8585
user.EmailAddress.Should().Be(email);
@@ -88,7 +88,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityFactoryCacheAsync()
8888
.Sql(sql)
8989
.Parameter("@EmailAddress", email)
9090
.UseCache(TimeSpan.FromMinutes(5))
91-
.QuerySingleAsync<User>();
91+
.QuerySingleAsync<User>(cancellationToken: TestCancellation);
9292

9393
cachedUser.Should().NotBeNull();
9494
cachedUser.EmailAddress.Should().Be(email);
@@ -105,7 +105,7 @@ public async System.Threading.Tasks.Task SqlQuerySingleEntityDynamicAsync()
105105

106106
dynamic user = await session.Sql(sql)
107107
.Parameter("@EmailAddress", email)
108-
.QuerySingleAsync();
108+
.QuerySingleAsync(cancellationToken: TestCancellation);
109109

110110
Assert.NotNull(user);
111111
Assert.Equal(user.EmailAddress, email);
@@ -141,7 +141,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityAsync()
141141
Updated = r.GetDateTimeOffset("Updated"),
142142
UpdatedBy = r.GetString("UpdatedBy"),
143143
RowVersion = r.GetBytes("RowVersion"),
144-
});
144+
}, cancellationToken: TestCancellation);
145145

146146
users.Should().NotBeNull();
147147
users.Should().NotBeEmpty();
@@ -158,7 +158,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicAsync()
158158

159159
IEnumerable<dynamic> users = await session.Sql(sql)
160160
.Parameter("@EmailAddress", email)
161-
.QueryAsync();
161+
.QueryAsync(cancellationToken: TestCancellation);
162162

163163
users.Should().NotBeNull();
164164
users.Should().NotBeEmpty();
@@ -177,7 +177,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicCacheAsync()
177177
.Sql(sql)
178178
.Parameter("@EmailAddress", email)
179179
.UseCache(TimeSpan.FromMinutes(5))
180-
.QueryAsync();
180+
.QueryAsync(cancellationToken: TestCancellation);
181181

182182
var userList = users.ToList();
183183

@@ -188,7 +188,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityDynamicCacheAsync()
188188
.Sql(sql)
189189
.Parameter("@EmailAddress", email)
190190
.UseCache(TimeSpan.FromMinutes(5))
191-
.QueryAsync();
191+
.QueryAsync(cancellationToken: TestCancellation);
192192

193193
var cachedList = cachedUsers.ToList();
194194

@@ -207,7 +207,7 @@ public async System.Threading.Tasks.Task SqlQueryEntityFactoryAsync()
207207

208208
var users = await session.Sql(sql)
209209
.Parameter("@EmailAddress", email)
210-
.QueryAsync<User>();
210+
.QueryAsync<User>(cancellationToken: TestCancellation);
211211

212212
users.Should().NotBeNull();
213213
users.Should().NotBeEmpty();
@@ -224,7 +224,7 @@ public async System.Threading.Tasks.Task SqlQueryTableAsync()
224224

225225
var users = await session.Sql(sql)
226226
.Parameter("@EmailAddress", email)
227-
.QueryTableAsync();
227+
.QueryTableAsync(cancellationToken: TestCancellation);
228228

229229
users.Should().NotBeNull();
230230
}
@@ -240,7 +240,7 @@ public async System.Threading.Tasks.Task SqlQueryValueAsync()
240240

241241
var count = await session.Sql(sql)
242242
.Parameter("@EmailAddress", email)
243-
.QueryValueAsync<int>();
243+
.QueryValueAsync<int>(cancellationToken: TestCancellation);
244244

245245
count.Should().BeGreaterThan(0);
246246
}
@@ -266,7 +266,7 @@ await session.Sql(sql)
266266
users.Add(user);
267267
}
268268
return System.Threading.Tasks.Task.CompletedTask;
269-
});
269+
}, cancellationToken: TestCancellation);
270270

271271
users.Should().NotBeNull();
272272
users.Should().NotBeEmpty();
@@ -292,10 +292,10 @@ await session.Sql(sql)
292292
.Parameter("@EmailAddress", email)
293293
.QueryMultipleAsync(async q =>
294294
{
295-
user = await q.QuerySingleAsync<User>();
296-
roles = (await q.QueryAsync<Role>()).ToList();
297-
priorities = (await q.QueryAsync<Priority>()).ToList();
298-
});
295+
user = await q.QuerySingleAsync<User>(cancellationToken: TestCancellation);
296+
roles = (await q.QueryAsync<Role>(cancellationToken: TestCancellation)).ToList();
297+
priorities = (await q.QueryAsync<Priority>(cancellationToken: TestCancellation)).ToList();
298+
}, cancellationToken: TestCancellation);
299299

300300
user.Should().NotBeNull();
301301
user.EmailAddress.Should().NotBeEmpty();

0 commit comments

Comments
 (0)