Skip to content

Commit 93ba0fd

Browse files
committed
Ignore paging + locking tests entirely if dialect does not support them
1 parent a68713d commit 93ba0fd

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/NHibernate.Test/Async/Linq/QueryLock.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ from o in c.Orders.Where(x => true).WithLock(LockMode.Upgrade)
170170
[Test]
171171
public async Task CanSetLockOnLinqPagingQueryAsync()
172172
{
173+
Assume.That(TestDialect.SupportsSelectForUpdateInSubQueries, Is.True, "Dialect does not support locking in subqueries");
173174
using (session.BeginTransaction())
174175
{
175176
var result = await ((from e in db.Customers
@@ -178,14 +179,14 @@ public async Task CanSetLockOnLinqPagingQueryAsync()
178179
Assert.That(result, Has.Count.EqualTo(5));
179180
Assert.That(session.GetCurrentLockMode(result[0]), Is.EqualTo(LockMode.Upgrade));
180181

181-
if (TestDialect.SupportsSelectForUpdateInSubQueries)
182-
await (AssertSeparateTransactionIsLockedOutAsync(result[0].CustomerId));
182+
await (AssertSeparateTransactionIsLockedOutAsync(result[0].CustomerId));
183183
}
184184
}
185185

186186
[Test]
187187
public async Task CanLockBeforeSkipOnLinqOrderedPageQueryAsync()
188188
{
189+
Assume.That(TestDialect.SupportsSelectForUpdateInSubQueries, Is.True, "Dialect does not support locking in subqueries");
189190
using (session.BeginTransaction())
190191
{
191192
var result = await ((from e in db.Customers
@@ -196,8 +197,7 @@ orderby e.CompanyName
196197
Assert.That(result, Has.Count.EqualTo(5));
197198
Assert.That(session.GetCurrentLockMode(result[0]), Is.EqualTo(LockMode.Upgrade));
198199

199-
if (TestDialect.SupportsSelectForUpdateInSubQueries)
200-
await (AssertSeparateTransactionIsLockedOutAsync(result[0].CustomerId));
200+
await (AssertSeparateTransactionIsLockedOutAsync(result[0].CustomerId));
201201
}
202202
}
203203

src/NHibernate.Test/Linq/QueryLock.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ from o in c.Orders.Where(x => true).WithLock(LockMode.Upgrade)
158158
[Test]
159159
public void CanSetLockOnLinqPagingQuery()
160160
{
161+
Assume.That(TestDialect.SupportsSelectForUpdateInSubQueries, Is.True, "Dialect does not support locking in subqueries");
161162
using (session.BeginTransaction())
162163
{
163164
var result = (from e in db.Customers
@@ -166,14 +167,14 @@ public void CanSetLockOnLinqPagingQuery()
166167
Assert.That(result, Has.Count.EqualTo(5));
167168
Assert.That(session.GetCurrentLockMode(result[0]), Is.EqualTo(LockMode.Upgrade));
168169

169-
if (TestDialect.SupportsSelectForUpdateInSubQueries)
170-
AssertSeparateTransactionIsLockedOut(result[0].CustomerId);
170+
AssertSeparateTransactionIsLockedOut(result[0].CustomerId);
171171
}
172172
}
173173

174174
[Test]
175175
public void CanLockBeforeSkipOnLinqOrderedPageQuery()
176176
{
177+
Assume.That(TestDialect.SupportsSelectForUpdateInSubQueries, Is.True, "Dialect does not support locking in subqueries");
177178
using (session.BeginTransaction())
178179
{
179180
var result = (from e in db.Customers
@@ -184,8 +185,7 @@ orderby e.CompanyName
184185
Assert.That(result, Has.Count.EqualTo(5));
185186
Assert.That(session.GetCurrentLockMode(result[0]), Is.EqualTo(LockMode.Upgrade));
186187

187-
if (TestDialect.SupportsSelectForUpdateInSubQueries)
188-
AssertSeparateTransactionIsLockedOut(result[0].CustomerId);
188+
AssertSeparateTransactionIsLockedOut(result[0].CustomerId);
189189
}
190190
}
191191

0 commit comments

Comments
 (0)