Skip to content

Commit 06094c0

Browse files
hazzikhazzik
committed
feat!: upgrade to NHibernate 5.3
1 parent d34774d commit 06094c0

File tree

11 files changed

+157
-155
lines changed

11 files changed

+157
-155
lines changed

‎src/NHibernate.Search.Tests/Async/Filter/FilterTest.cs

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,22 @@ public async Task ParameterizedFilterAsync()
4343
try
4444
{
4545
await (CreateDataAsync());
46-
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
47-
s.Transaction.Begin();
48-
BooleanQuery query = new BooleanQuery();
49-
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
50-
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
51-
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
52-
53-
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
54-
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
55-
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
56-
57-
await (s.Transaction.CommitAsync());
58-
s.Close();
59-
}
46+
using (var s = Search.CreateFullTextSession(OpenSession()))
47+
using (var t = s.BeginTransaction())
48+
{
49+
BooleanQuery query = new BooleanQuery();
50+
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
51+
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
52+
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
53+
54+
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
55+
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
56+
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
57+
58+
await (t.CommitAsync());
59+
s.Close();
60+
}
61+
}
6062
finally
6163
{
6264
await (DeleteDataAsync());
@@ -72,29 +74,28 @@ public async Task ParameterizedFilterWithSearchQueryAsync()
7274
const string y = "Match";
7375

7476
using (var session = OpenSession())
75-
{
76-
session.Transaction.Begin();
77-
78-
var deliveryDate = new DateTime(2000, 1, 1);
79-
await (saveNewDriverAsync(session, 1, n, n, deliveryDate, -1));
80-
await (saveNewDriverAsync(session, 2, y, y, deliveryDate, -1));
81-
await (saveNewDriverAsync(session, 3, y, y, deliveryDate, -1));
82-
await (saveNewDriverAsync(session, 4, n, n, deliveryDate, -1));
83-
await (saveNewDriverAsync(session, 5, y, y, deliveryDate, -1));
84-
await (saveNewDriverAsync(session, 6, n, y, deliveryDate, -1));
85-
await (saveNewDriverAsync(session, 7, n, n, deliveryDate, -1));
86-
await (saveNewDriverAsync(session, 8, y, n, deliveryDate, -1));
87-
await (saveNewDriverAsync(session, 9, y, y, deliveryDate, -1));
88-
await (saveNewDriverAsync(session, 10, n, n, deliveryDate, -1));
89-
await (saveNewDriverAsync(session, 11, y, y, deliveryDate, -1));
90-
await (saveNewDriverAsync(session, 12, n, n, deliveryDate, -1));
91-
await (saveNewDriverAsync(session, 13, n, n, deliveryDate, -1));
92-
await (saveNewDriverAsync(session, 14, n, y, deliveryDate, -1));
93-
await (saveNewDriverAsync(session, 15, y, n, deliveryDate, -1));
94-
await (session.Transaction.CommitAsync());
95-
}
96-
97-
using (var session = OpenSession())
77+
using (var t = session.BeginTransaction())
78+
{
79+
var deliveryDate = new DateTime(2000, 1, 1);
80+
await (saveNewDriverAsync(session, 1, n, n, deliveryDate, -1));
81+
await (saveNewDriverAsync(session, 2, y, y, deliveryDate, -1));
82+
await (saveNewDriverAsync(session, 3, y, y, deliveryDate, -1));
83+
await (saveNewDriverAsync(session, 4, n, n, deliveryDate, -1));
84+
await (saveNewDriverAsync(session, 5, y, y, deliveryDate, -1));
85+
await (saveNewDriverAsync(session, 6, n, y, deliveryDate, -1));
86+
await (saveNewDriverAsync(session, 7, n, n, deliveryDate, -1));
87+
await (saveNewDriverAsync(session, 8, y, n, deliveryDate, -1));
88+
await (saveNewDriverAsync(session, 9, y, y, deliveryDate, -1));
89+
await (saveNewDriverAsync(session, 10, n, n, deliveryDate, -1));
90+
await (saveNewDriverAsync(session, 11, y, y, deliveryDate, -1));
91+
await (saveNewDriverAsync(session, 12, n, n, deliveryDate, -1));
92+
await (saveNewDriverAsync(session, 13, n, n, deliveryDate, -1));
93+
await (saveNewDriverAsync(session, 14, n, y, deliveryDate, -1));
94+
await (saveNewDriverAsync(session, 15, y, n, deliveryDate, -1));
95+
await (t.CommitAsync());
96+
}
97+
98+
using (var session = OpenSession())
9899
using (var ftSession = Search.CreateFullTextSession(session))
99100
{
100101
var parser = new QueryParser(Version.LUCENE_29, "name", new StandardAnalyzer(Version.LUCENE_29));
@@ -121,17 +122,17 @@ public async Task ParameterizedFilterWithSearchQueryAsync()
121122
private async Task DeleteDataAsync(CancellationToken cancellationToken = default(CancellationToken))
122123
{
123124
ISession s = OpenSession();
124-
s.Transaction.Begin();
125+
var t = s.BeginTransaction();
125126
await (s.CreateQuery("delete Driver").ExecuteUpdateAsync(cancellationToken));
126127
Search.CreateFullTextSession(s).PurgeAll(typeof(Driver));
127-
await (s.Transaction.CommitAsync(cancellationToken));
128+
await (t.CommitAsync(cancellationToken));
128129
s.Close();
129130
}
130131

131132
private async Task CreateDataAsync(CancellationToken cancellationToken = default(CancellationToken))
132133
{
133134
ISession s = OpenSession();
134-
s.Transaction.Begin();
135+
var t = s.BeginTransaction();
135136
Driver driver = new Driver();
136137
driver.Delivery = new DateTime(2006, 10, 11);
137138
driver.Id = 1;
@@ -155,7 +156,7 @@ public async Task ParameterizedFilterWithSearchQueryAsync()
155156
driver.Score = 5;
156157
driver.Teacher = "max";
157158
await (s.SaveAsync(driver, cancellationToken));
158-
await (s.Transaction.CommitAsync(cancellationToken));
159+
await (t.CommitAsync(cancellationToken));
159160
s.Close();
160161
}
161162

‎src/NHibernate.Search.Tests/Async/Session/MassIndexTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ protected override IEnumerable<string> Mappings
3131
[Test]
3232
public async Task BatchSizeAsync()
3333
{
34-
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
35-
ITransaction tx = s.BeginTransaction();
34+
var s = Search.CreateFullTextSession(OpenSession());
35+
var tx = s.BeginTransaction();
3636
int loop = 14;
3737
for (int i = 0; i < loop; i++)
3838
{
3939
using (var cmd = s.Connection.CreateCommand())
4040
{
41-
s.Transaction.Enlist(cmd);
41+
tx.Enlist(cmd);
4242
cmd.CommandText = "insert into Email(Id, Title, Body, Header) values( + " + (i + 1)
4343
+ ", 'Bob Sponge', 'Meet the guys who create the software', 'nope')";
4444
await (cmd.ExecuteNonQueryAsync());
@@ -98,10 +98,10 @@ public async Task TransactionalAsync()
9898
s.Close();
9999

100100
s = new FullTextSessionImpl(OpenSession());
101-
s.Transaction.Begin();
101+
var t = s.BeginTransaction();
102102
using (var cmd = s.Connection.CreateCommand())
103103
{
104-
s.Transaction.Enlist(cmd);
104+
t.Enlist(cmd);
105105
cmd.CommandText = "update Email set Body='Meet the guys who write the software'";
106106
await (cmd.ExecuteNonQueryAsync());
107107

@@ -110,7 +110,7 @@ public async Task TransactionalAsync()
110110
await (cmd.ExecuteNonQueryAsync());
111111
}
112112

113-
await (s.Transaction.CommitAsync());
113+
await (t.CommitAsync());
114114
s.Close();
115115

116116
s = new FullTextSessionImpl(OpenSession());

‎src/NHibernate.Search.Tests/Filter/FilterTest.cs

Lines changed: 78 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,22 @@ public void ParameterizedFilter()
3131
try
3232
{
3333
CreateData();
34-
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
35-
s.Transaction.Begin();
36-
BooleanQuery query = new BooleanQuery();
37-
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
38-
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
39-
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
34+
using (var s = Search.CreateFullTextSession(OpenSession()))
35+
using (var t = s.BeginTransaction())
36+
{
37+
BooleanQuery query = new BooleanQuery();
38+
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
39+
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
40+
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
4041

41-
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
42-
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
43-
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
42+
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
43+
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
44+
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
4445

45-
s.Transaction.Commit();
46-
s.Close();
47-
}
46+
t.Commit();
47+
s.Close();
48+
}
49+
}
4850
finally
4951
{
5052
DeleteData();
@@ -60,29 +62,28 @@ public void ParameterizedFilterWithSearchQuery()
6062
const string y = "Match";
6163

6264
using (var session = OpenSession())
63-
{
64-
session.Transaction.Begin();
65-
66-
var deliveryDate = new DateTime(2000, 1, 1);
67-
saveNewDriver(session, 1, n, n, deliveryDate, -1);
68-
saveNewDriver(session, 2, y, y, deliveryDate, -1);
69-
saveNewDriver(session, 3, y, y, deliveryDate, -1);
70-
saveNewDriver(session, 4, n, n, deliveryDate, -1);
71-
saveNewDriver(session, 5, y, y, deliveryDate, -1);
72-
saveNewDriver(session, 6, n, y, deliveryDate, -1);
73-
saveNewDriver(session, 7, n, n, deliveryDate, -1);
74-
saveNewDriver(session, 8, y, n, deliveryDate, -1);
75-
saveNewDriver(session, 9, y, y, deliveryDate, -1);
76-
saveNewDriver(session, 10, n, n, deliveryDate, -1);
77-
saveNewDriver(session, 11, y, y, deliveryDate, -1);
78-
saveNewDriver(session, 12, n, n, deliveryDate, -1);
79-
saveNewDriver(session, 13, n, n, deliveryDate, -1);
80-
saveNewDriver(session, 14, n, y, deliveryDate, -1);
81-
saveNewDriver(session, 15, y, n, deliveryDate, -1);
82-
session.Transaction.Commit();
83-
}
65+
using (var t = session.BeginTransaction())
66+
{
67+
var deliveryDate = new DateTime(2000, 1, 1);
68+
saveNewDriver(session, 1, n, n, deliveryDate, -1);
69+
saveNewDriver(session, 2, y, y, deliveryDate, -1);
70+
saveNewDriver(session, 3, y, y, deliveryDate, -1);
71+
saveNewDriver(session, 4, n, n, deliveryDate, -1);
72+
saveNewDriver(session, 5, y, y, deliveryDate, -1);
73+
saveNewDriver(session, 6, n, y, deliveryDate, -1);
74+
saveNewDriver(session, 7, n, n, deliveryDate, -1);
75+
saveNewDriver(session, 8, y, n, deliveryDate, -1);
76+
saveNewDriver(session, 9, y, y, deliveryDate, -1);
77+
saveNewDriver(session, 10, n, n, deliveryDate, -1);
78+
saveNewDriver(session, 11, y, y, deliveryDate, -1);
79+
saveNewDriver(session, 12, n, n, deliveryDate, -1);
80+
saveNewDriver(session, 13, n, n, deliveryDate, -1);
81+
saveNewDriver(session, 14, n, y, deliveryDate, -1);
82+
saveNewDriver(session, 15, y, n, deliveryDate, -1);
83+
t.Commit();
84+
}
8485

85-
using (var session = OpenSession())
86+
using (var session = OpenSession())
8687
using (var ftSession = Search.CreateFullTextSession(session))
8788
{
8889
var parser = new QueryParser(Version.LUCENE_29, "name", new StandardAnalyzer(Version.LUCENE_29));
@@ -109,28 +110,30 @@ public void CombinedFilters()
109110
try
110111
{
111112
CreateData();
112-
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
113-
s.Transaction.Begin();
114-
BooleanQuery query = new BooleanQuery();
115-
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
116-
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
117-
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
113+
using (var s = Search.CreateFullTextSession(OpenSession()))
114+
using (var t = s.BeginTransaction())
115+
{
116+
BooleanQuery query = new BooleanQuery();
117+
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
118+
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
119+
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
118120

119-
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
120-
ftQuery.EnableFullTextFilter("bestDriver");
121-
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
122-
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
121+
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
122+
ftQuery.EnableFullTextFilter("bestDriver");
123+
ftQuery.EnableFullTextFilter("security").SetParameter("Login", "andre");
124+
Assert.AreEqual(1, ftQuery.ResultSize, "Should filter to limit to Emmanuel");
123125

124-
ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
125-
ftQuery.EnableFullTextFilter("bestDriver");
126-
ftQuery.EnableFullTextFilter("security").SetParameter("login", "andre");
127-
ftQuery.DisableFullTextFilter("security");
128-
ftQuery.DisableFullTextFilter("bestDriver");
129-
Assert.AreEqual(3, ftQuery.ResultSize, "Should not filter anymore");
126+
ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
127+
ftQuery.EnableFullTextFilter("bestDriver");
128+
ftQuery.EnableFullTextFilter("security").SetParameter("login", "andre");
129+
ftQuery.DisableFullTextFilter("security");
130+
ftQuery.DisableFullTextFilter("bestDriver");
131+
Assert.AreEqual(3, ftQuery.ResultSize, "Should not filter anymore");
130132

131-
s.Transaction.Commit();
132-
s.Close();
133-
}
133+
t.Commit();
134+
s.Close();
135+
}
136+
}
134137
finally
135138
{
136139
DeleteData();
@@ -145,7 +148,7 @@ public void Cache()
145148
{
146149
CreateData();
147150
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
148-
s.Transaction.Begin();
151+
var t = s.BeginTransaction();
149152
BooleanQuery query = new BooleanQuery();
150153
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
151154
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
@@ -169,7 +172,7 @@ public void Cache()
169172
Assert.Fail("Cache does not work");
170173
}
171174

172-
s.Transaction.Commit();
175+
t.Commit();
173176
s.Close();
174177

175178
}
@@ -186,22 +189,24 @@ public void StraightFilters()
186189
try
187190
{
188191
CreateData();
189-
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
190-
s.Transaction.Begin();
191-
BooleanQuery query = new BooleanQuery();
192-
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
193-
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
194-
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
192+
using (var s = Search.CreateFullTextSession(OpenSession()))
193+
using (var t = s.BeginTransaction())
194+
{
195+
BooleanQuery query = new BooleanQuery();
196+
query.Add(new TermQuery(new Term("teacher", "andre")), BooleanClause.Occur.SHOULD);
197+
query.Add(new TermQuery(new Term("teacher", "max")), BooleanClause.Occur.SHOULD);
198+
query.Add(new TermQuery(new Term("teacher", "aaron")), BooleanClause.Occur.SHOULD);
195199

196-
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
197-
ftQuery.EnableFullTextFilter("bestDriver");
198-
Lucene.Net.Search.Filter dateFilter = new TermRangeFilter("delivery", "2001", "2005", true, true);
199-
ftQuery.SetFilter(dateFilter);
200-
Assert.AreEqual(1, ftQuery.ResultSize, "Should select only liz");
200+
IFullTextQuery ftQuery = s.CreateFullTextQuery(query, typeof(Driver));
201+
ftQuery.EnableFullTextFilter("bestDriver");
202+
Lucene.Net.Search.Filter dateFilter = new TermRangeFilter("delivery", "2001", "2005", true, true);
203+
ftQuery.SetFilter(dateFilter);
204+
Assert.AreEqual(1, ftQuery.ResultSize, "Should select only liz");
201205

202-
s.Transaction.Commit();
203-
s.Close();
204-
}
206+
t.Commit();
207+
s.Close();
208+
}
209+
}
205210
finally
206211
{
207212
DeleteData();
@@ -215,17 +220,17 @@ public void StraightFilters()
215220
private void DeleteData()
216221
{
217222
ISession s = OpenSession();
218-
s.Transaction.Begin();
223+
var t = s.BeginTransaction();
219224
s.CreateQuery("delete Driver").ExecuteUpdate();
220225
Search.CreateFullTextSession(s).PurgeAll(typeof(Driver));
221-
s.Transaction.Commit();
226+
t.Commit();
222227
s.Close();
223228
}
224229

225230
private void CreateData()
226231
{
227232
ISession s = OpenSession();
228-
s.Transaction.Begin();
233+
var t = s.BeginTransaction();
229234
Driver driver = new Driver();
230235
driver.Delivery = new DateTime(2006, 10, 11);
231236
driver.Id = 1;
@@ -249,7 +254,7 @@ private void CreateData()
249254
driver.Score = 5;
250255
driver.Teacher = "max";
251256
s.Save(driver);
252-
s.Transaction.Commit();
257+
t.Commit();
253258
s.Close();
254259
}
255260

‎src/NHibernate.Search.Tests/PhysicalTestCase.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ protected void DeleteBaseIndexDir()
4747
protected override void OnTearDown()
4848
{
4949
base.OnTearDown();
50-
if (sessions != null)
51-
{
52-
sessions.Close(); // Close the files in the indexDir
53-
}
5450

5551
DeleteBaseIndexDir();
5652
}

0 commit comments

Comments
 (0)