Skip to content

Commit b13c5b8

Browse files
fredericDelaportehazzik
fredericDelaporte
authored and
hazzik
committed
NH-4021 - enforce session tracking in tests (#636)
1 parent 7ffa17a commit b13c5b8

File tree

187 files changed

+1269
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+1269
-840
lines changed

‎src/NHibernate.Test/Ado/BatcherFixture.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
3434
[Description("The batcher should run all INSERT queries in only one roundtrip.")]
3535
public void OneRoundTripInserts()
3636
{
37-
sessions.Statistics.Clear();
37+
Sfi.Statistics.Clear();
3838
FillDb();
3939

40-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
40+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
4141
Cleanup();
4242
}
4343

4444
private void Cleanup()
4545
{
46-
using (ISession s = sessions.OpenSession())
46+
using (ISession s = Sfi.OpenSession())
4747
using (s.BeginTransaction())
4848
{
4949
s.CreateQuery("delete from VerySimple").ExecuteUpdate();
@@ -54,7 +54,7 @@ private void Cleanup()
5454

5555
private void FillDb()
5656
{
57-
using (ISession s = sessions.OpenSession())
57+
using (ISession s = Sfi.OpenSession())
5858
using (ITransaction tx = s.BeginTransaction())
5959
{
6060
s.Save(new VerySimple {Id = 1, Name = "Fabio", Weight = 119.5});
@@ -69,34 +69,34 @@ public void OneRoundTripUpdate()
6969
{
7070
FillDb();
7171

72-
using (ISession s = sessions.OpenSession())
72+
using (ISession s = Sfi.OpenSession())
7373
using (ITransaction tx = s.BeginTransaction())
7474
{
7575
var vs1 = s.Get<VerySimple>(1);
7676
var vs2 = s.Get<VerySimple>(2);
7777
vs1.Weight -= 10;
7878
vs2.Weight -= 1;
79-
sessions.Statistics.Clear();
79+
Sfi.Statistics.Clear();
8080
s.Update(vs1);
8181
s.Update(vs2);
8282
tx.Commit();
8383
}
8484

85-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
85+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
8686
Cleanup();
8787
}
8888

8989
[Test, Ignore("Not fixed yet.")]
9090
[Description("SqlClient: The batcher should run all different INSERT queries in only one roundtrip.")]
9191
public void SqlClientOneRoundTripForUpdateAndInsert()
9292
{
93-
if (sessions.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
93+
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
9494
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
9595

9696
FillDb();
9797

9898
using(var sqlLog = new SqlLogSpy())
99-
using (ISession s = sessions.OpenSession())
99+
using (ISession s = Sfi.OpenSession())
100100
using (ITransaction tx = s.BeginTransaction())
101101
{
102102
s.Save(new VerySimple
@@ -128,7 +128,7 @@ public void SqlClientOneRoundTripForUpdateAndInsert()
128128
[Description("SqlClient: The batcher log output should be formatted")]
129129
public void BatchedoutputShouldBeFormatted()
130130
{
131-
if (sessions.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
131+
if (Sfi.Settings.BatcherFactory is SqlClientBatchingBatcherFactory == false)
132132
Assert.Ignore("This test is for SqlClientBatchingBatcher only");
133133

134134
using (var sqlLog = new SqlLogSpy())
@@ -148,18 +148,18 @@ public void OneRoundTripDelete()
148148
{
149149
FillDb();
150150

151-
using (ISession s = sessions.OpenSession())
151+
using (ISession s = Sfi.OpenSession())
152152
using (ITransaction tx = s.BeginTransaction())
153153
{
154154
var vs1 = s.Get<VerySimple>(1);
155155
var vs2 = s.Get<VerySimple>(2);
156-
sessions.Statistics.Clear();
156+
Sfi.Statistics.Clear();
157157
s.Delete(vs1);
158158
s.Delete(vs2);
159159
tx.Commit();
160160
}
161161

162-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
162+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
163163
Cleanup();
164164
}
165165

@@ -174,7 +174,7 @@ public void SqlLog()
174174
{
175175
using (var sl = new SqlLogSpy())
176176
{
177-
sessions.Statistics.Clear();
177+
Sfi.Statistics.Clear();
178178
FillDb();
179179
string logs = sl.GetWholeLog();
180180
Assert.That(logs, Does.Not.Contain("Adding to batch").IgnoreCase);
@@ -183,7 +183,7 @@ public void SqlLog()
183183
}
184184
}
185185

186-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
186+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
187187
Cleanup();
188188
}
189189

@@ -198,7 +198,7 @@ public void AbstractBatcherLog()
198198
{
199199
using (var sl = new SqlLogSpy())
200200
{
201-
sessions.Statistics.Clear();
201+
Sfi.Statistics.Clear();
202202
FillDb();
203203
string logs = sl.GetWholeLog();
204204
Assert.That(logs, Does.Contain("batch").IgnoreCase);
@@ -213,7 +213,7 @@ public void AbstractBatcherLog()
213213
}
214214
}
215215

216-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
216+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
217217
Cleanup();
218218
}
219219

@@ -224,14 +224,14 @@ public void SqlLogShouldGetBatchCommandNotification()
224224
{
225225
using (var sl = new SqlLogSpy())
226226
{
227-
sessions.Statistics.Clear();
227+
Sfi.Statistics.Clear();
228228
FillDb();
229229
string logs = sl.GetWholeLog();
230230
Assert.That(logs, Does.Contain("Batch commands:").IgnoreCase);
231231
}
232232
}
233233

234-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
234+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
235235
Cleanup();
236236
}
237237

@@ -244,7 +244,7 @@ public void AbstractBatcherLogFormattedSql()
244244
{
245245
using (var sl = new SqlLogSpy())
246246
{
247-
sessions.Statistics.Clear();
247+
Sfi.Statistics.Clear();
248248
FillDb();
249249
foreach (var loggingEvent in sl.Appender.GetEvents())
250250
{
@@ -266,7 +266,7 @@ public void AbstractBatcherLogFormattedSql()
266266
}
267267
}
268268

269-
Assert.That(sessions.Statistics.PrepareStatementCount, Is.EqualTo(1));
269+
Assert.That(Sfi.Statistics.PrepareStatementCount, Is.EqualTo(1));
270270
Cleanup();
271271
}
272272
}

‎src/NHibernate.Test/BulkManipulation/BaseFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override void Configure(Cfg.Configuration configuration)
3333

3434
public string GetSql(string query)
3535
{
36-
var qt = new QueryTranslatorImpl(null, new HqlParseEngine(query, false, sessions).Parse(), emptyfilters, sessions);
36+
var qt = new QueryTranslatorImpl(null, new HqlParseEngine(query, false, Sfi).Parse(), emptyfilters, Sfi);
3737
qt.Compile(null, false);
3838
return qt.SQLString;
3939
}

‎src/NHibernate.Test/CacheTest/FilterKeyFixture.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ protected override IList Mappings
2222
public void ToStringIncludeAll()
2323
{
2424
string filterName = "DescriptionLike";
25-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
25+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
2626
f.SetParameter("pLike", "so%");
2727
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
2828
Assert.That(fk.ToString(), Is.EqualTo("FilterKey[DescriptionLike{'pLike'='so%'}]"));
2929

3030
filterName = "DescriptionEqualAndValueGT";
31-
f = new FilterImpl(sessions.GetFilterDefinition(filterName));
31+
f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
3232
f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
3333
fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
3434
Assert.That(fk.ToString(), Is.EqualTo("FilterKey[DescriptionEqualAndValueGT{'pDesc'='something', 'pValue'='10'}]"));
@@ -49,23 +49,23 @@ public void Equality()
4949
private void FilterDescLikeToCompare(out FilterKey fk, out FilterKey fk1)
5050
{
5151
const string filterName = "DescriptionLike";
52-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
52+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
5353
f.SetParameter("pLike", "so%");
5454
fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
5555

56-
var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
56+
var f1 = new FilterImpl(Sfi.GetFilterDefinition(filterName));
5757
f1.SetParameter("pLike", "%ing");
5858
fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
5959
}
6060

6161
private void FilterDescValueToCompare(out FilterKey fk, out FilterKey fk1)
6262
{
6363
const string filterName = "DescriptionEqualAndValueGT";
64-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
64+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
6565
f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
6666
fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
6767

68-
var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
68+
var f1 = new FilterImpl(Sfi.GetFilterDefinition(filterName));
6969
f1.SetParameter("pDesc", "something").SetParameter("pValue", 11);
7070
fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
7171
}

‎src/NHibernate.Test/CacheTest/QueryKeyFixture.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,34 @@ public void EqualityWithFilters()
3838
private void QueryKeyFilterDescLikeToCompare(out QueryKey qk, out QueryKey qk1)
3939
{
4040
const string filterName = "DescriptionLike";
41-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
41+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
4242
f.SetParameter("pLike", "so%");
4343
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
4444
ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
45-
qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
45+
qk = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
4646

47-
var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
47+
var f1 = new FilterImpl(Sfi.GetFilterDefinition(filterName));
4848
f1.SetParameter("pLike", "%ing");
4949
var fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
5050
fks = new HashSet<FilterKey> { fk1 };
51-
qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
51+
qk1 = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
5252
}
5353

5454
private void QueryKeyFilterDescValueToCompare(out QueryKey qk, out QueryKey qk1)
5555
{
5656
const string filterName = "DescriptionEqualAndValueGT";
5757

58-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
58+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
5959
f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
6060
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
6161
ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
62-
qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
62+
qk = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
6363

64-
var f1 = new FilterImpl(sessions.GetFilterDefinition(filterName));
64+
var f1 = new FilterImpl(Sfi.GetFilterDefinition(filterName));
6565
f1.SetParameter("pDesc", "something").SetParameter("pValue", 11);
6666
var fk1 = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
6767
fks = new HashSet<FilterKey> { fk1 };
68-
qk1 = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
68+
qk1 = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
6969
}
7070

7171
[Test]
@@ -109,37 +109,37 @@ public void NotEqualHashCodeWithFilters()
109109
public void ToStringWithFilters()
110110
{
111111
string filterName = "DescriptionLike";
112-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
112+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
113113
f.SetParameter("pLike", "so%");
114114
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
115115
ISet<FilterKey> fks = new HashSet<FilterKey> { fk };
116-
var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
116+
var qk = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
117117
Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}']",fk)));
118118

119119
filterName = "DescriptionEqualAndValueGT";
120-
f = new FilterImpl(sessions.GetFilterDefinition(filterName));
120+
f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
121121
f.SetParameter("pDesc", "something").SetParameter("pValue", 10);
122122
fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
123123
fks = new HashSet<FilterKey> { fk };
124-
qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
124+
qk = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
125125
Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}']", fk)));
126126
}
127127

128128
[Test]
129129
public void ToStringWithMoreFilters()
130130
{
131131
string filterName = "DescriptionLike";
132-
var f = new FilterImpl(sessions.GetFilterDefinition(filterName));
132+
var f = new FilterImpl(Sfi.GetFilterDefinition(filterName));
133133
f.SetParameter("pLike", "so%");
134134
var fk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
135135

136136
filterName = "DescriptionEqualAndValueGT";
137-
var fv = new FilterImpl(sessions.GetFilterDefinition(filterName));
137+
var fv = new FilterImpl(Sfi.GetFilterDefinition(filterName));
138138
fv.SetParameter("pDesc", "something").SetParameter("pValue", 10);
139139
var fvk = new FilterKey(filterName, f.Parameters, f.FilterDefinition.ParameterTypes);
140140

141141
ISet<FilterKey> fks = new HashSet<FilterKey> { fk, fvk };
142-
var qk = new QueryKey(sessions, SqlAll, new QueryParameters(), fks, null);
142+
var qk = new QueryKey(Sfi, SqlAll, new QueryParameters(), fks, null);
143143
Assert.That(qk.ToString(), Does.Contain(string.Format("filters: ['{0}', '{1}']", fk, fvk)));
144144
}
145145
}

‎src/NHibernate.Test/Cascade/Circle/MultiPathCircleCascadeTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,22 +424,22 @@ protected override void OnTearDown()
424424

425425
protected void ClearCounts()
426426
{
427-
sessions.Statistics.Clear();
427+
Sfi.Statistics.Clear();
428428
}
429429

430430
protected void AssertInsertCount(long expected)
431431
{
432-
Assert.That(sessions.Statistics.EntityInsertCount, Is.EqualTo(expected), "unexpected insert count");
432+
Assert.That(Sfi.Statistics.EntityInsertCount, Is.EqualTo(expected), "unexpected insert count");
433433
}
434434

435435
protected void AssertUpdateCount(long expected)
436436
{
437-
Assert.That(sessions.Statistics.EntityUpdateCount, Is.EqualTo(expected), "unexpected update count");
437+
Assert.That(Sfi.Statistics.EntityUpdateCount, Is.EqualTo(expected), "unexpected update count");
438438
}
439439

440440
protected void AssertDeleteCount(long expected)
441441
{
442-
Assert.That(sessions.Statistics.EntityDeleteCount, Is.EqualTo(expected), "unexpected delete count");
442+
Assert.That(Sfi.Statistics.EntityDeleteCount, Is.EqualTo(expected), "unexpected delete count");
443443
}
444444
}
445445
}

0 commit comments

Comments
 (0)