Skip to content

Commit db1e0fa

Browse files
fredericDelaportefredericDelaporte
committed
Reformat tests for better readability on GitHub
And modernize some constructs
1 parent db6b51e commit db1e0fa

File tree

7 files changed

+411
-225
lines changed

7 files changed

+411
-225
lines changed

‎src/NHibernate.Test/Async/NHSpecificTest/NH3848/CriteriaTestFixture.cs

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ public class CriteriaTestFixtureAsync : FixtureAsync
2323
{
2424
try
2525
{
26-
return session.CreateCriteria<Customer>()
27-
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin)
28-
.SetResultTransformer(new DistinctRootEntityResultTransformer())
29-
.ListAsync<Customer>(cancellationToken);
26+
return
27+
session
28+
.CreateCriteria<Customer>()
29+
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin)
30+
.SetResultTransformer(new DistinctRootEntityResultTransformer())
31+
.ListAsync<Customer>(cancellationToken);
3032
}
3133
catch (System.Exception ex)
3234
{
@@ -38,10 +40,12 @@ public class CriteriaTestFixtureAsync : FixtureAsync
3840
{
3941
try
4042
{
41-
return session.CreateCriteria<Customer>()
42-
.Fetch("Orders")
43-
.SetResultTransformer(new DistinctRootEntityResultTransformer())
44-
.ListAsync<Customer>(cancellationToken);
43+
return
44+
session
45+
.CreateCriteria<Customer>()
46+
.Fetch("Orders")
47+
.SetResultTransformer(new DistinctRootEntityResultTransformer())
48+
.ListAsync<Customer>(cancellationToken);
4549
}
4650
catch (System.Exception ex)
4751
{
@@ -53,24 +57,30 @@ public class CriteriaTestFixtureAsync : FixtureAsync
5357
{
5458
try
5559
{
56-
return session.CreateCriteria<Customer>()
57-
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
58-
.ListAsync<Customer>(cancellationToken);
60+
return
61+
session
62+
.CreateCriteria<Customer>()
63+
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
64+
.ListAsync<Customer>(cancellationToken);
5965
}
6066
catch (System.Exception ex)
6167
{
6268
return Task.FromException<IList<Customer>>(ex);
6369
}
6470
}
6571

66-
protected override Task<IList<Customer>> GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(ISession session, int orderNumber, CancellationToken cancellationToken = default(CancellationToken))
72+
protected override Task<IList<Customer>> GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(
73+
ISession session,
74+
int orderNumber, CancellationToken cancellationToken = default(CancellationToken))
6775
{
6876
try
6977
{
70-
return session.CreateCriteria<Customer>()
71-
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
72-
.CreateAlias("Companies", "company", JoinType.LeftOuterJoin)
73-
.ListAsync<Customer>(cancellationToken);
78+
return
79+
session
80+
.CreateCriteria<Customer>()
81+
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
82+
.CreateAlias("Companies", "company", JoinType.LeftOuterJoin)
83+
.ListAsync<Customer>(cancellationToken);
7484
}
7585
catch (System.Exception ex)
7686
{
@@ -82,11 +92,13 @@ public class CriteriaTestFixtureAsync : FixtureAsync
8292
{
8393
try
8494
{
85-
return session.CreateCriteria<Customer>()
86-
.CreateCriteria("Orders", "Order", JoinType.LeftOuterJoin)
87-
.Add(Restrictions.Eq("Number", orderNumber))
88-
.SetResultTransformer(new DistinctRootEntityResultTransformer())
89-
.ListAsync<Customer>(cancellationToken);
95+
return
96+
session
97+
.CreateCriteria<Customer>()
98+
.CreateCriteria("Orders", "Order", JoinType.LeftOuterJoin)
99+
.Add(Restrictions.Eq("Number", orderNumber))
100+
.SetResultTransformer(new DistinctRootEntityResultTransformer())
101+
.ListAsync<Customer>(cancellationToken);
90102
}
91103
catch (System.Exception ex)
92104
{
@@ -98,32 +110,41 @@ public class CriteriaTestFixtureAsync : FixtureAsync
98110
{
99111
try
100112
{
101-
return session.CreateCriteria<Customer>()
102-
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin)
103-
.Add(Restrictions.Eq("Name", "First Customer"))
104-
.SetResultTransformer(new DistinctRootEntityResultTransformer())
105-
.ListAsync<Customer>(cancellationToken);
113+
return
114+
session
115+
.CreateCriteria<Customer>()
116+
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin)
117+
.Add(Restrictions.Eq("Name", "First Customer"))
118+
.SetResultTransformer(new DistinctRootEntityResultTransformer())
119+
.ListAsync<Customer>(cancellationToken);
106120
}
107121
catch (System.Exception ex)
108122
{
109123
return Task.FromException<IList<Customer>>(ex);
110124
}
111125
}
112126

113-
protected override Task<IList<Customer>> GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(ISession session, int orderNumber, string customerName, CancellationToken cancellationToken = default(CancellationToken))
127+
protected override Task<IList<Customer>> GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(
128+
ISession session,
129+
int orderNumber,
130+
string customerName, CancellationToken cancellationToken = default(CancellationToken))
114131
{
115132
try
116133
{
117-
var detachedCriteria = DetachedCriteria.For<Customer>()
118-
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
119-
.SetProjection(Projections.Id());
134+
var detachedCriteria =
135+
DetachedCriteria
136+
.For<Customer>()
137+
.CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber))
138+
.SetProjection(Projections.Id());
120139

121-
return session.CreateCriteria<Customer>()
122-
.CreateAlias("Orders", "order1", JoinType.LeftOuterJoin)
123-
.Add(Subqueries.PropertyIn("Id", detachedCriteria))
124-
.Add(Restrictions.Eq("Name", customerName))
125-
.SetResultTransformer(new DistinctRootEntityResultTransformer())
126-
.ListAsync<Customer>(cancellationToken);
140+
return
141+
session
142+
.CreateCriteria<Customer>()
143+
.CreateAlias("Orders", "order1", JoinType.LeftOuterJoin)
144+
.Add(Subqueries.PropertyIn("Id", detachedCriteria))
145+
.Add(Restrictions.Eq("Name", customerName))
146+
.SetResultTransformer(new DistinctRootEntityResultTransformer())
147+
.ListAsync<Customer>(cancellationToken);
127148
}
128149
catch (System.Exception ex)
129150
{

‎src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs

Lines changed: 71 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,15 @@ public virtual async Task ChildCollectionsFromLeftOuterJoinWithOnClauseRestricti
167167
var secondSession = OpenSession();
168168
var customers = await (GetAllCustomersAsync(secondSession));
169169

170-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
171-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
172-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer3.Id).Orders, Has.Count.EqualTo(Customer3.Orders.Count(n => n.Number == OrderNumber)));
170+
Assert.That(
171+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders,
172+
Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
173+
Assert.That(
174+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders,
175+
Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
176+
Assert.That(
177+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer3.Id).Orders,
178+
Has.Count.EqualTo(Customer3.Orders.Count(n => n.Number == OrderNumber)));
173179

174180
Assert.That(customers.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
175181
Assert.That(customers.Single(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(Customer2.Orders.Count));
@@ -188,8 +194,12 @@ public async Task ChildCollectionsFromLeftOuterJoinWithWhereClauseRestrictionOnC
188194
var secondSession = OpenSession();
189195
var customers = await (GetAllCustomersAsync(secondSession));
190196

191-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
192-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
197+
Assert.That(
198+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders,
199+
Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
200+
Assert.That(
201+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders,
202+
Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
193203

194204
Assert.That(customers.Single(n => n.Id == Customer3.Id).Orders, Has.Count.EqualTo(Customer3.Orders.Count));
195205
Assert.That(customers.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
@@ -216,8 +226,12 @@ public async Task ChildCollectionsEagerFetchedShouldBeInSecondLevelCacheAsync()
216226
var secondSession = OpenSession();
217227
var customers = await (GetAllCustomersAsync(secondSession));
218228

219-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
220-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(Customer2.Orders.Count));
229+
Assert.That(
230+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders,
231+
Has.Count.EqualTo(Customer1.Orders.Count));
232+
Assert.That(
233+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer2.Id).Orders,
234+
Has.Count.EqualTo(Customer2.Orders.Count));
221235

222236
Assert.That(customers.Single(n => n.Id == Customer3.Id).Orders, Has.Count.EqualTo(Customer3.Orders.Count));
223237
Assert.That(customers.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
@@ -244,7 +258,9 @@ public async Task ChildCollectionsFromLeftOuterJoinWithWhereClauseRestrictionOnR
244258
var secondSession = OpenSession();
245259
var customers = await (secondSession.GetAsync<Customer>(Customer1.Id));
246260

247-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
261+
Assert.That(
262+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders,
263+
Has.Count.EqualTo(Customer1.Orders.Count));
248264
Assert.That(customers.Orders, Has.Count.EqualTo(Customer1.Orders.Count));
249265

250266
firstSession.Dispose();
@@ -255,12 +271,18 @@ public async Task ChildCollectionsFromLeftOuterJoinWithWhereClauseRestrictionOnR
255271
public async Task ChildCollectionsFromLeftOuterJoinShouldBeInSecondLevelCacheIfQueryContainsSubqueryWithRestrictionOnLeftOuterJoinAsync()
256272
{
257273
var firstSession = OpenSession();
258-
var customersWithOrderNumberEqualsTo2 = await (GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(firstSession, OrderNumber, Customer1.Name));
274+
var customersWithOrderNumberEqualsTo2 =
275+
await (GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(
276+
firstSession,
277+
OrderNumber,
278+
Customer1.Name));
259279

260280
var secondSession = OpenSession();
261281
var customers = await (GetAllCustomersAsync(secondSession));
262282

263-
Assert.That(customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count));
283+
Assert.That(
284+
customersWithOrderNumberEqualsTo2.Single(n => n.Id == Customer1.Id).Orders,
285+
Has.Count.EqualTo(Customer1.Orders.Count));
264286

265287
using (var thirdSession = OpenSession())
266288
using (IDbCommand cmd = thirdSession.Connection.CreateCommand())
@@ -282,7 +304,8 @@ public async Task ChildCollectionsFromLeftOuterJoinShouldBeInSecondLevelCacheIfQ
282304
public virtual async Task ChildCollectionsFromLeftOuterJoinOnlyWithRestrictionShouldNotBeIn2LvlCacheAsync()
283305
{
284306
var firstSession = OpenSession();
285-
var customersWithOrderNumberEqualsTo2AndCompanies = await (GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(firstSession, OrderNumber));
307+
var customersWithOrderNumberEqualsTo2AndCompanies =
308+
await (GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(firstSession, OrderNumber));
286309

287310
using (var session = OpenSession())
288311
using (IDbCommand cmd = session.Connection.CreateCommand())
@@ -303,21 +326,39 @@ public virtual async Task ChildCollectionsFromLeftOuterJoinOnlyWithRestrictionSh
303326
var secondSession = OpenSession();
304327
var customers = await (GetAllCustomersAsync(secondSession));
305328

306-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
307-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
308-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer3.Id).Orders, Has.Count.EqualTo(Customer3.Orders.Count(n => n.Number == OrderNumber)));
309-
310-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer1.Id).Companies, Has.Count.EqualTo(Customer1.Companies.Count()));
311-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer2.Id).Companies, Has.Count.EqualTo(Customer2.Companies.Count()));
312-
Assert.That(customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer3.Id).Companies, Has.Count.EqualTo(Customer3.Companies.Count()));
329+
Assert.That(
330+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer1.Id).Orders,
331+
Has.Count.EqualTo(Customer1.Orders.Count(n => n.Number == OrderNumber)));
332+
Assert.That(
333+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer2.Id).Orders,
334+
Has.Count.EqualTo(Customer2.Orders.Count(n => n.Number == OrderNumber)));
335+
Assert.That(
336+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer3.Id).Orders,
337+
Has.Count.EqualTo(Customer3.Orders.Count(n => n.Number == OrderNumber)));
338+
339+
Assert.That(
340+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer1.Id).Companies,
341+
Has.Count.EqualTo(Customer1.Companies.Count()));
342+
Assert.That(
343+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer2.Id).Companies,
344+
Has.Count.EqualTo(Customer2.Companies.Count()));
345+
Assert.That(
346+
customersWithOrderNumberEqualsTo2AndCompanies.First(n => n.Id == Customer3.Id).Companies,
347+
Has.Count.EqualTo(Customer3.Companies.Count()));
313348

314349
Assert.That(customers.Single(n => n.Id == Customer1.Id).Orders, Has.Count.EqualTo(0));
315350
Assert.That(customers.Single(n => n.Id == Customer2.Id).Orders, Has.Count.EqualTo(0));
316351
Assert.That(customers.Single(n => n.Id == Customer3.Id).Orders, Has.Count.EqualTo(0));
317352

318-
Assert.That(customers.Single(n => n.Id == Customer1.Id).Companies, Has.Count.EqualTo(Customer1.Companies.Count));
319-
Assert.That(customers.Single(n => n.Id == Customer2.Id).Companies, Has.Count.EqualTo(Customer2.Companies.Count));
320-
Assert.That(customers.Single(n => n.Id == Customer3.Id).Companies, Has.Count.EqualTo(Customer3.Companies.Count));
353+
Assert.That(
354+
customers.Single(n => n.Id == Customer1.Id).Companies,
355+
Has.Count.EqualTo(Customer1.Companies.Count));
356+
Assert.That(
357+
customers.Single(n => n.Id == Customer2.Id).Companies,
358+
Has.Count.EqualTo(Customer2.Companies.Count));
359+
Assert.That(
360+
customers.Single(n => n.Id == Customer3.Id).Companies,
361+
Has.Count.EqualTo(Customer3.Companies.Count));
321362

322363
firstSession.Dispose();
323364
secondSession.Dispose();
@@ -356,7 +397,7 @@ protected void ClearSecondLevelCacheFor(System.Type entity)
356397
if (memberExpression == null)
357398
return Task.FromException<object>(new ArgumentException("pathToCollection should be member expression"));
358399

359-
var role = string.Format("{0}.{1}", rootEntityTypeFullPath, memberExpression.Member.Name);
400+
var role = $"{rootEntityTypeFullPath}.{memberExpression.Member.Name}";
360401
return Sfi.EvictCollectionAsync(role, cancellationToken);
361402
}
362403
catch (Exception ex)
@@ -372,7 +413,7 @@ protected void ClearCollectionCache<T>(Expression<Func<T, IEnumerable>> pathToCo
372413
if (memberExpression == null)
373414
throw new ArgumentException("pathToCollection should be member expression");
374415

375-
var role = string.Format("{0}.{1}", rootEntityTypeFullPath, memberExpression.Member.Name);
416+
var role = $"{rootEntityTypeFullPath}.{memberExpression.Member.Name}";
376417
Sfi.EvictCollection(role);
377418
}
378419

@@ -381,8 +422,13 @@ protected void ClearCollectionCache<T>(Expression<Func<T, IEnumerable>> pathToCo
381422
protected abstract Task<IList<Customer>> GetCustomersByOrderNumberUsingOnClauseAsync(ISession session, int orderNumber, CancellationToken cancellationToken = default(CancellationToken));
382423
protected abstract Task<IList<Customer>> GetCustomersByOrderNumberUsingWhereClauseAsync(ISession session, int orderNumber, CancellationToken cancellationToken = default(CancellationToken));
383424
protected abstract Task<IList<Customer>> GetCustomersByNameUsingWhereClauseAsync(ISession session, string customerName, CancellationToken cancellationToken = default(CancellationToken));
384-
protected abstract Task<IList<Customer>> GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(ISession session, int orderNumber, string customerName, CancellationToken cancellationToken = default(CancellationToken));
385-
protected abstract Task<IList<Customer>> GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(ISession session, int orderNumber, CancellationToken cancellationToken = default(CancellationToken));
425+
protected abstract Task<IList<Customer>> GetCustomersByOrderNumberUsingSubqueriesAndByNameUsingWhereClauseAsync(
426+
ISession session,
427+
int orderNumber,
428+
string customerName, CancellationToken cancellationToken = default(CancellationToken));
429+
protected abstract Task<IList<Customer>> GetCustomersWithCompaniesByOrderNumberUsingOnClauseAsync(
430+
ISession session,
431+
int orderNumber, CancellationToken cancellationToken = default(CancellationToken));
386432
protected abstract Task<IList<Customer>> GetAllCustomersAsync(ISession session, CancellationToken cancellationToken = default(CancellationToken));
387433
}
388434
}

0 commit comments

Comments
 (0)