Skip to content

Commit fb7a19c

Browse files
committed
Address review: use positive assertions and wrap async calls in Assert.DoesNotThrowAsync
1 parent 48e65aa commit fb7a19c

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/Query/ElementaryTests.cs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,10 @@ public async Task SqlQueryScalarSingleQuotesValueColumn()
215215
{
216216
await using (var db = await GetDbContext<SelectContext>())
217217
{
218-
var result = await db.Database.SqlQueryRaw<int>(@"SELECT 1 AS ""Value"" FROM RDB$DATABASE").SingleAsync();
218+
var query = db.Database.SqlQueryRaw<int>(@"SELECT 1 AS ""Value"" FROM RDB$DATABASE");
219+
Assert.DoesNotThrowAsync(() => query.SingleAsync());
219220
var sql = db.LastCommandText;
220-
Assert.AreEqual(1, result);
221-
StringAssert.DoesNotContain("Value", sql.Replace(@"""Value""", string.Empty));
221+
StringAssert.Contains(@"""Value""", sql);
222222
}
223223
}
224224

@@ -227,10 +227,10 @@ public async Task SqlQueryScalarSingleOrDefaultQuotesValueColumn()
227227
{
228228
await using (var db = await GetDbContext<SelectContext>())
229229
{
230-
var result = await db.Database.SqlQueryRaw<int>(@"SELECT 1 AS ""Value"" FROM RDB$DATABASE").SingleOrDefaultAsync();
230+
var query = db.Database.SqlQueryRaw<int>(@"SELECT 1 AS ""Value"" FROM RDB$DATABASE");
231+
Assert.DoesNotThrowAsync(() => query.SingleOrDefaultAsync());
231232
var sql = db.LastCommandText;
232-
Assert.AreEqual(1, result);
233-
StringAssert.DoesNotContain("Value", sql.Replace(@"""Value""", string.Empty));
233+
StringAssert.Contains(@"""Value""", sql);
234234
}
235235
}
236236

@@ -242,7 +242,7 @@ public async Task SqlQueryScalarComposedWhereQuotesValueColumn()
242242
var query = db.Database.SqlQueryRaw<int>(@"SELECT 1 AS ""Value"" FROM RDB$DATABASE").Where(x => x > 0);
243243
Assert.DoesNotThrowAsync(() => query.LoadAsync());
244244
var sql = db.LastCommandText;
245-
StringAssert.DoesNotContain("Value", sql.Replace(@"""Value""", string.Empty));
245+
StringAssert.Contains(@"""Value""", sql);
246246
}
247247
}
248248

@@ -251,9 +251,8 @@ public async Task EntitySingleOrDefaultQuotesIdentifiers()
251251
{
252252
await using (var db = await GetDbContext<SelectContext>())
253253
{
254-
var result = await db.Set<MonAttachment>().OrderBy(x => x.AttachmentId).Take(1).SingleOrDefaultAsync();
255-
var sql = db.LastCommandText;
256-
Assert.IsNotNull(result);
254+
var query = db.Set<MonAttachment>().OrderBy(x => x.AttachmentId).Take(1);
255+
Assert.DoesNotThrowAsync(() => query.SingleOrDefaultAsync());
257256
}
258257
}
259258
}

0 commit comments

Comments
 (0)