Skip to content

Commit 860fbf7

Browse files
hazzikhazzik
committed
test: fix ProjectionQueryTest
1 parent 4ac5b3f commit 860fbf7

File tree

3 files changed

+43
-47
lines changed

3 files changed

+43
-47
lines changed

‎src/NHibernate.Search.Tests/Async/Query/ProjectionQueryTest.cs

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using Lucene.Net.Util;
12+
1113
namespace NHibernate.Search.Tests.Query
1214
{
1315
using System;
@@ -44,16 +46,15 @@ protected override IEnumerable<string> Mappings
4446
//{
4547
//}
4648

47-
[Test, Explicit]
49+
[Test]
4850
public async Task ResultTransformToDelimStringAsync()
4951
{
50-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
51-
await (this.PrepEmployeeIndexAsync(s));
52+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
53+
await (PrepEmployeeIndexAsync(s));
5254

5355
s.Clear();
5456
ITransaction tx = s.BeginTransaction();
55-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
56-
57+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
5758
Query query = parser.Parse("Dept:ITech");
5859
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
5960
hibQuery.SetProjection(
@@ -66,25 +67,25 @@ public async Task ResultTransformToDelimStringAsync()
6667
ProjectionConstants.ID);
6768
hibQuery.SetResultTransformer(new ProjectionToDelimStringResultTransformer());
6869

69-
IList result = await (hibQuery.ListAsync());
70-
Assert.IsTrue(((string)result[0]).StartsWith("1000, Griffin, ITech"), "incorrect transformation");
71-
Assert.IsTrue(((string)result[1]).StartsWith("1002, Jimenez, ITech"), "incorrect transformation");
70+
var result = await (hibQuery.ListAsync<string>());
71+
Assert.That(result[3], Does.StartWith("1000, Griffin, ITech"), "incorrect transformation");
72+
Assert.That(result[2], Does.StartWith("1002, Jimenez, ITech"), "incorrect transformation");
7273

7374
// cleanup
7475
await (s.DeleteAsync("from System.Object"));
7576
await (tx.CommitAsync());
7677
s.Close();
7778
}
7879

79-
[Test, Explicit]
80+
[Test]
8081
public async Task ResultTransformMapAsync()
8182
{
82-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
83-
await (this.PrepEmployeeIndexAsync(s));
83+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
84+
await (PrepEmployeeIndexAsync(s));
8485

8586
s.Clear();
8687
ITransaction tx = s.BeginTransaction();
87-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
88+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
8889

8990
Query query = parser.Parse("Dept:ITech");
9091
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
@@ -99,8 +100,8 @@ public async Task ResultTransformMapAsync()
99100
ProjectionConstants.ID);
100101
hibQuery.SetResultTransformer(new ProjectionToMapResultTransformer());
101102

102-
IList transforms = await (hibQuery.ListAsync());
103-
Dictionary<string, object> map = (Dictionary<string, object>)transforms[1];
103+
var transforms = await (hibQuery.ListAsync<Dictionary<string, object>>());
104+
var map = transforms[2];
104105

105106
Assert.AreEqual("ITech", map["Dept"], "incorrect transformation");
106107
Assert.AreEqual(1002, map["Id"], "incorrect transformation");
@@ -119,12 +120,12 @@ public async Task ResultTransformMapAsync()
119120
[Test]
120121
public async Task LuceneObjectsProjectionWithIterateAsync()
121122
{
122-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
123-
await (this.PrepEmployeeIndexAsync(s));
123+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
124+
await (PrepEmployeeIndexAsync(s));
124125

125126
s.Clear();
126127
ITransaction tx = s.BeginTransaction();
127-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
128+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
128129

129130
Query query = parser.Parse("Dept:ITech");
130131
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
@@ -162,12 +163,12 @@ public async Task LuceneObjectsProjectionWithIterateAsync()
162163
[Test]
163164
public async Task LuceneObjectsProjectionWithListAsync()
164165
{
165-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
166-
await (this.PrepEmployeeIndexAsync(s));
166+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
167+
await (PrepEmployeeIndexAsync(s));
167168

168169
s.Clear();
169170
ITransaction tx = s.BeginTransaction();
170-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
171+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
171172

172173
Query query = parser.Parse("Dept:Accounting");
173174
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));

‎src/NHibernate.Search.Tests/Query/ProjectionQueryTest.cs

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using Lucene.Net.Util;
2+
13
namespace NHibernate.Search.Tests.Query
24
{
35
using System;
@@ -32,16 +34,15 @@ protected override IEnumerable<string> Mappings
3234
//{
3335
//}
3436

35-
[Test, Explicit]
37+
[Test]
3638
public void ResultTransformToDelimString()
3739
{
38-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
39-
this.PrepEmployeeIndex(s);
40+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
41+
PrepEmployeeIndex(s);
4042

4143
s.Clear();
4244
ITransaction tx = s.BeginTransaction();
43-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
44-
45+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
4546
Query query = parser.Parse("Dept:ITech");
4647
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
4748
hibQuery.SetProjection(
@@ -54,25 +55,25 @@ public void ResultTransformToDelimString()
5455
ProjectionConstants.ID);
5556
hibQuery.SetResultTransformer(new ProjectionToDelimStringResultTransformer());
5657

57-
IList result = hibQuery.List();
58-
Assert.IsTrue(((string)result[0]).StartsWith("1000, Griffin, ITech"), "incorrect transformation");
59-
Assert.IsTrue(((string)result[1]).StartsWith("1002, Jimenez, ITech"), "incorrect transformation");
58+
var result = hibQuery.List<string>();
59+
Assert.That(result[3], Does.StartWith("1000, Griffin, ITech"), "incorrect transformation");
60+
Assert.That(result[2], Does.StartWith("1002, Jimenez, ITech"), "incorrect transformation");
6061

6162
// cleanup
6263
s.Delete("from System.Object");
6364
tx.Commit();
6465
s.Close();
6566
}
6667

67-
[Test, Explicit]
68+
[Test]
6869
public void ResultTransformMap()
6970
{
70-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
71-
this.PrepEmployeeIndex(s);
71+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
72+
PrepEmployeeIndex(s);
7273

7374
s.Clear();
7475
ITransaction tx = s.BeginTransaction();
75-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
76+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
7677

7778
Query query = parser.Parse("Dept:ITech");
7879
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
@@ -87,8 +88,8 @@ public void ResultTransformMap()
8788
ProjectionConstants.ID);
8889
hibQuery.SetResultTransformer(new ProjectionToMapResultTransformer());
8990

90-
IList transforms = hibQuery.List();
91-
Dictionary<string, object> map = (Dictionary<string, object>)transforms[1];
91+
var transforms = hibQuery.List<Dictionary<string, object>>();
92+
var map = transforms[2];
9293

9394
Assert.AreEqual("ITech", map["Dept"], "incorrect transformation");
9495
Assert.AreEqual(1002, map["Id"], "incorrect transformation");
@@ -107,12 +108,12 @@ public void ResultTransformMap()
107108
[Test]
108109
public void LuceneObjectsProjectionWithIterate()
109110
{
110-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
111-
this.PrepEmployeeIndex(s);
111+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
112+
PrepEmployeeIndex(s);
112113

113114
s.Clear();
114115
ITransaction tx = s.BeginTransaction();
115-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
116+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
116117

117118
Query query = parser.Parse("Dept:ITech");
118119
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));
@@ -150,12 +151,12 @@ public void LuceneObjectsProjectionWithIterate()
150151
[Test]
151152
public void LuceneObjectsProjectionWithList()
152153
{
153-
IFullTextSession s = Search.CreateFullTextSession(this.OpenSession());
154-
this.PrepEmployeeIndex(s);
154+
IFullTextSession s = Search.CreateFullTextSession(OpenSession());
155+
PrepEmployeeIndex(s);
155156

156157
s.Clear();
157158
ITransaction tx = s.BeginTransaction();
158-
QueryParser parser = new QueryParser(Lucene.Net.Util.LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(Lucene.Net.Util.LuceneVersion.LUCENE_48));
159+
QueryParser parser = new QueryParser(LuceneVersion.LUCENE_48, "Dept", new StandardAnalyzer(LuceneVersion.LUCENE_48));
159160

160161
Query query = parser.Parse("Dept:Accounting");
161162
IFullTextQuery hibQuery = s.CreateFullTextQuery(query, typeof(Employee));

‎src/NHibernate.Search.Tests/Query/ProjectionToDelimStringResultTransformer.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@ public class ProjectionToDelimStringResultTransformer : IResultTransformer
88
{
99
public object TransformTuple(object[] tuple, string[] aliases)
1010
{
11-
string s = tuple[0].ToString();
12-
for (int i = 1; i < tuple.Length; i++)
13-
{
14-
s += ", " + tuple[i];
15-
}
16-
17-
return s;
11+
return string.Join(", ", tuple);
1812
}
1913

2014
public IList TransformList(IList collection)

0 commit comments

Comments
 (0)