@@ -34,7 +34,7 @@ public void ReuseFreeText1Test()
3434 {
3535 Assert . Throws < QueryTranslationException > (
3636 ( ) => {
37- var result1 = TakeMatchesIncorrect ( "best greatest hits " ) . Count ( ) ;
37+ var result1 = TakeMatchesIncorrect ( "black babbath back " ) . Count ( ) ;
3838 Assert . AreEqual ( 3 , result1 ) ;
3939 var result2 = TakeMatchesIncorrect ( "1212erddfr324324rwefrtb43543543" ) . Count ( ) ;
4040 Assert . AreEqual ( 0 , result2 ) ;
@@ -44,17 +44,17 @@ public void ReuseFreeText1Test()
4444 [ Test ]
4545 public void ReuseFreeText2Test ( )
4646 {
47- var result1 = TakeMatchesCorrect ( "best greatest hits " ) . Count ( ) ;
48- Assert . AreEqual ( 24 , result1 ) ;
47+ var result1 = TakeMatchesCorrect ( "black babbath back " ) . Count ( ) ;
48+ Assert . AreEqual ( 6 , result1 ) ;
4949 var result2 = TakeMatchesCorrect ( "1212erddfr324324rwefrtb43543543" ) . Count ( ) ;
5050 Assert . AreEqual ( 0 , result2 ) ;
5151 }
5252
5353 [ Test ]
5454 public void Test1 ( )
5555 {
56- var result = Session . Query . FreeText < Album > ( ( ) => "best greatest hits " ) . ToList ( ) ;
57- Assert . AreEqual ( 24 , result . Count ) ;
56+ var result = Session . Query . FreeText < Album > ( ( ) => "black babbath back " ) . ToList ( ) ;
57+ Assert . AreEqual ( 6 , result . Count ) ;
5858 foreach ( var document in result ) {
5959 Assert . IsNotNull ( document ) ;
6060 Assert . IsNotNull ( document . Entity ) ;
@@ -64,16 +64,16 @@ public void Test1()
6464 [ Test ]
6565 public void Test2 ( )
6666 {
67- var result = from c in Session . Query . FreeText < Album > ( "best greatest hits " ) select c . Rank ;
68- Assert . AreEqual ( 24 , result . ToList ( ) . Count ) ;
67+ var result = from c in Session . Query . FreeText < Album > ( "black babbath back " ) select c . Rank ;
68+ Assert . AreEqual ( 6 , result . ToList ( ) . Count ) ;
6969 }
7070
7171 [ Test ]
7272 public void TopNByRankTest ( )
7373 {
74- var allMatchingRecords = Session . Query . FreeText < Album > ( "best greatest hits " ) ;
75- Assert . AreEqual ( 24 , allMatchingRecords . Count ( ) ) ;
76- var topNMatchingRecords = Session . Query . FreeText < Album > ( "best greatest hits " , 2 ) . ToList ( ) ;
74+ var allMatchingRecords = Session . Query . FreeText < Album > ( "black babbath back " ) ;
75+ Assert . AreEqual ( 6 , allMatchingRecords . Count ( ) ) ;
76+ var topNMatchingRecords = Session . Query . FreeText < Album > ( "black babbath back " , 2 ) . ToList ( ) ;
7777 Assert . AreEqual ( 2 , topNMatchingRecords . Count ( ) ) ;
7878 var top2Records = allMatchingRecords . OrderByDescending ( record => record . Rank ) . Take ( 2 ) ;
7979 Assert . IsTrue ( topNMatchingRecords . Select ( rec => rec . Entity . Title ) . SequenceEqual ( top2Records . Select ( rec1 => rec1 . Entity . Title ) ) ) ;
@@ -82,9 +82,9 @@ public void TopNByRankTest()
8282 [ Test ]
8383 public void TopNByRankQueryTest ( )
8484 {
85- var allMatchingRecords = Query . FreeText < Album > ( "best greatest hits " ) ;
86- Assert . AreEqual ( 24 , allMatchingRecords . Count ( ) ) ;
87- var topNMatchingRecords = Query . FreeText < Album > ( "best greatest hits " , 2 ) . ToList ( ) ;
85+ var allMatchingRecords = Query . FreeText < Album > ( "black babbath back " ) ;
86+ Assert . AreEqual ( 6 , allMatchingRecords . Count ( ) ) ;
87+ var topNMatchingRecords = Query . FreeText < Album > ( "black babbath back " , 2 ) . ToList ( ) ;
8888 Assert . AreEqual ( 2 , topNMatchingRecords . Count ( ) ) ;
8989 var top2Records = allMatchingRecords . OrderByDescending ( record => record . Rank ) . Take ( 2 ) ;
9090 Assert . IsTrue ( topNMatchingRecords . Select ( rec => rec . Entity . Title ) . SequenceEqual ( top2Records . Select ( rec1 => rec1 . Entity . Title ) ) ) ;
@@ -93,9 +93,9 @@ public void TopNByRankQueryTest()
9393 [ Test ]
9494 public void TopNByRankExpressionTest ( )
9595 {
96- var allMatchingRecords = Session . Query . FreeText < Album > ( ( ) => "best greatest hits " ) ;
97- Assert . AreEqual ( 24 , allMatchingRecords . Count ( ) ) ;
98- var topNMatchingRecords = Session . Query . FreeText < Album > ( ( ) => "best greatest hits " , 2 ) . ToList ( ) ;
96+ var allMatchingRecords = Session . Query . FreeText < Album > ( ( ) => "black babbath back " ) ;
97+ Assert . AreEqual ( 6 , allMatchingRecords . Count ( ) ) ;
98+ var topNMatchingRecords = Session . Query . FreeText < Album > ( ( ) => "black babbath back " , 2 ) . ToList ( ) ;
9999 Assert . AreEqual ( 2 , topNMatchingRecords . Count ) ;
100100 var top2Records = allMatchingRecords . OrderByDescending ( rec => rec . Rank ) . Take ( 2 ) ;
101101 Assert . IsTrue ( topNMatchingRecords . Select ( rec => rec . Entity . Title ) . SequenceEqual ( top2Records . Select ( rec1 => rec1 . Entity . Title ) ) ) ;
@@ -104,9 +104,9 @@ public void TopNByRankExpressionTest()
104104 [ Test ]
105105 public void TopNByRankQueryExpressionTest ( )
106106 {
107- var allMatchingRecords = Query . FreeText < Album > ( ( ) => "best greatest hits " ) ;
108- Assert . AreEqual ( 24 , allMatchingRecords . Count ( ) ) ;
109- var topNMatchingRecords = Query . FreeText < Album > ( ( ) => "best greatest hits " , 2 ) . ToList ( ) ;
107+ var allMatchingRecords = Query . FreeText < Album > ( ( ) => "black babbath back " ) ;
108+ Assert . AreEqual ( 6 , allMatchingRecords . Count ( ) ) ;
109+ var topNMatchingRecords = Query . FreeText < Album > ( ( ) => "black babbath back " , 2 ) . ToList ( ) ;
110110 Assert . AreEqual ( 2 , topNMatchingRecords . Count ) ;
111111 var top2Records = allMatchingRecords . OrderByDescending ( rec => rec . Rank ) . Take ( 2 ) ;
112112 Assert . IsTrue ( topNMatchingRecords . Select ( rec => rec . Entity . Title ) . SequenceEqual ( top2Records . Select ( rec1 => rec1 . Entity . Title ) ) ) ;
@@ -137,10 +137,10 @@ public void ZeroTopNTest()
137137 public void TopNByRankJoinTracksTest ( )
138138 {
139139 var result =
140- from c in Session . Query . FreeText < Album > ( ( ) => "best greatest hits " , 1 )
140+ from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " , 1 )
141141 join p in Session . Query . All < Track > ( ) on c . Entity . Key equals p . Album . Key
142142 select p ;
143- Assert . AreEqual ( 17 , result . ToList ( ) . Count ) ;
143+ Assert . AreEqual ( 12 , result . ToList ( ) . Count ) ;
144144 foreach ( var track in result ) {
145145 Assert . IsNotNull ( track ) ;
146146 Assert . IsNotNull ( track . Key ) ;
@@ -151,11 +151,11 @@ join p in Session.Query.All<Track>() on c.Entity.Key equals p.Album.Key
151151 public void JoinTracksTest ( )
152152 {
153153 var result =
154- from c in Session . Query . FreeText < Album > ( ( ) => "Black Best Greatest " )
154+ from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " )
155155 join p in Session . Query . All < Track > ( ) on c . Entity . Key equals p . Album . Key
156156 select p ;
157157 var list = result . ToList ( ) ;
158- Assert . AreEqual ( 432 , list . Count ) ;
158+ Assert . AreEqual ( 59 , list . Count ) ;
159159 foreach ( var track in result ) {
160160 Assert . IsNotNull ( track ) ;
161161 Assert . IsNotNull ( track . Key ) ;
@@ -166,11 +166,11 @@ join p in Session.Query.All<Track>() on c.Entity.Key equals p.Album.Key
166166 public void JoinTracks2Test ( )
167167 {
168168 var result =
169- from c in Session . Query . FreeText < Album > ( ( ) => "Black Best Greatest " )
169+ from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " )
170170 join p in Session . Query . All < Track > ( ) on c . Entity equals p . Album
171171 select p ;
172172 var list = result . ToList ( ) ;
173- Assert . AreEqual ( 432 , list . Count ) ;
173+ Assert . AreEqual ( 59 , list . Count ) ;
174174 foreach ( var track in result ) {
175175 Assert . IsNotNull ( track ) ;
176176 Assert . IsNotNull ( track . Key ) ;
@@ -181,10 +181,10 @@ join p in Session.Query.All<Track>() on c.Entity equals p.Album
181181 public void TopNByRankJoinTracksTest2 ( )
182182 {
183183 var result =
184- from c in Session . Query . FreeText < Album > ( ( ) => "Black Best Greatest " , 1 )
184+ from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " , 1 )
185185 join p in Session . Query . All < Track > ( ) on c . Entity equals p . Album
186186 select p ;
187- Assert . AreEqual ( 7 , result . ToList ( ) . Count ) ;
187+ Assert . AreEqual ( 12 , result . ToList ( ) . Count ) ;
188188 foreach ( var track in result ) {
189189 Assert . IsNotNull ( track ) ;
190190 Assert . IsNotNull ( track . Key ) ;
@@ -307,11 +307,11 @@ private static string GetTrackDescription(Track p)
307307 public void JoinTracksWithRanks1Test ( )
308308 {
309309 var result =
310- ( from c in Session . Query . FreeText < Album > ( ( ) => "best greatest Hits " )
310+ ( from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " )
311311 orderby c . Rank
312312 select new { c . Entity , c . Rank } ) ;
313313 var list = result . ToList ( ) ;
314- Assert . AreEqual ( 24 , list . Count ) ;
314+ Assert . AreEqual ( 6 , list . Count ) ;
315315 foreach ( var track in result ) {
316316 Assert . IsNotNull ( track ) ;
317317 }
@@ -321,7 +321,7 @@ orderby c.Rank
321321 public void TopNByRankJoinTracksWithRanks1Test ( )
322322 {
323323 var result =
324- ( from c in Session . Query . FreeText < Album > ( ( ) => "best greatest Hits " , 2 )
324+ ( from c in Session . Query . FreeText < Album > ( ( ) => "black babbath back " , 2 )
325325 orderby c . Rank
326326 select new { c . Entity , c . Rank } ) ;
327327 var list = result . ToList ( ) ;
@@ -334,11 +334,11 @@ orderby c.Rank
334334 [ Test ]
335335 public void JoinTracksWithRanks2Test ( )
336336 {
337- var result = Session . Query . FreeText < Album > ( ( ) => "best greatest Hits " )
337+ var result = Session . Query . FreeText < Album > ( ( ) => "black babbath back " )
338338 . OrderBy ( c => c . Rank )
339339 . Select ( x => x . Entity ) ;
340340 var list = result . ToList ( ) ;
341- Assert . AreEqual ( 24 , list . Count ) ;
341+ Assert . AreEqual ( 6 , list . Count ) ;
342342 foreach ( var track in result ) {
343343 Assert . IsNotNull ( track ) ;
344344 }
@@ -347,7 +347,7 @@ public void JoinTracksWithRanks2Test()
347347 [ Test ]
348348 public void TopNByRankJoinTracksWithRanks2Test ( )
349349 {
350- var result = Session . Query . FreeText < Album > ( ( ) => "best greatest Hits " , 2 )
350+ var result = Session . Query . FreeText < Album > ( ( ) => "black babbath back " , 2 )
351351 . OrderBy ( c => c . Rank )
352352 . Select ( x => x . Entity ) ;
353353 var list = result . ToList ( ) ;
@@ -371,11 +371,17 @@ where ft.Entity.TrackId > 0 && ft.Entity.UnitPrice > 0.8m
371371 [ Test ]
372372 public void TopNByRankOrderByTest ( )
373373 {
374- var keywords = "best greatestHits" ;
375- var defaultFreeTextQuery = Session . Query . FreeText < Album > ( keywords ) . Take ( 2 ) . OrderBy ( r => r . Rank ) . ToList ( ) ;
376- Assert . IsTrue ( defaultFreeTextQuery . Count ( ) == 2 ) ;
377- var topNByrankOrdered = Session . Query . FreeText < Album > ( keywords , 2 ) . OrderBy ( r => r . Rank ) ;
378- Assert . IsTrue ( topNByrankOrdered . Count ( ) == 2 ) ;
374+ var keywords = "black babbath back" ;
375+ var topNByrankOrdered = Session . Query . FreeText < Album > ( keywords , 3 )
376+ . OrderBy ( r => r . Rank ) . ToArray ( ) ;
377+ var defaultFreeTextQuery = Session . Query . FreeText < Album > ( keywords )
378+ . AsEnumerable ( )
379+ . OrderByDescending ( r => r . Rank )
380+ . Take ( 3 )
381+ . OrderBy ( r => r . Rank )
382+ . ToList ( ) ;
383+ Assert . IsTrue ( defaultFreeTextQuery . Count ( ) == 3 ) ;
384+ Assert . IsTrue ( topNByrankOrdered . Count ( ) == 3 ) ;
379385 Assert . IsTrue (
380386 defaultFreeTextQuery
381387 . Select ( rec => rec . Entity . Title )
@@ -385,11 +391,17 @@ public void TopNByRankOrderByTest()
385391 [ Test ]
386392 public void TopNByRankOrderByExpressionTest ( )
387393 {
388- var keywords = "best greatestHits" ;
389- var defaultFreeTextQuery = Session . Query . FreeText < Album > ( ( ) => keywords ) . Take ( 2 ) . OrderBy ( r => r . Rank ) . ToList ( ) ;
390- Assert . IsTrue ( defaultFreeTextQuery . Count ( ) == 2 ) ;
391- var topnByRankOrdered = Session . Query . FreeText < Album > ( ( ) => keywords , 2 ) . OrderBy ( r => r . Rank ) ;
392- Assert . IsTrue ( topnByRankOrdered . Count ( ) == 2 ) ;
394+ var keywords = "black babbath back" ;
395+ var topnByRankOrdered = Session . Query . FreeText < Album > ( ( ) => keywords , 3 )
396+ . OrderBy ( r => r . Rank ) ;
397+ var defaultFreeTextQuery = Session . Query . FreeText < Album > ( ( ) => keywords )
398+ . AsEnumerable ( )
399+ . OrderByDescending ( r => r . Rank )
400+ . Take ( 3 )
401+ . OrderBy ( r => r . Rank )
402+ . ToList ( ) ;
403+ Assert . IsTrue ( defaultFreeTextQuery . Count ( ) == 3 ) ;
404+ Assert . IsTrue ( topnByRankOrdered . Count ( ) == 3 ) ;
393405 Assert . IsTrue (
394406 defaultFreeTextQuery
395407 . Select ( rec => rec . Entity . Title )
@@ -399,7 +411,7 @@ public void TopNByRankOrderByExpressionTest()
399411 [ Test ]
400412 public void TopNByRankTakeMaxTest ( )
401413 {
402- var keywords = "best greatestHits " ;
414+ var keywords = "black babbath back " ;
403415 var topNByRank = Session . Query . FreeText < Album > ( keywords , 3 ) . ToList ( ) ;
404416 Assert . IsTrue ( topNByRank . Count ( ) == 3 ) ;
405417 var topNByRankTakeSameAmmount = Session . Query . FreeText < Album > ( keywords , 3 ) . Take ( 3 ) . OrderByDescending ( r => r . Rank ) ;
@@ -413,7 +425,7 @@ public void TopNByRankTakeMaxTest()
413425 [ Test ]
414426 public void TopNByRankTakeLessThanMaxTest ( )
415427 {
416- var keywords = "best greatestHits " ;
428+ var keywords = "black babbath back " ;
417429 var topNByRank = Session . Query . FreeText < Album > ( keywords , 3 ) ;
418430 Assert . IsTrue ( topNByRank . Count ( ) == 3 ) ;
419431 var topNByRankTakeLess = Session . Query . FreeText < Album > ( keywords , 3 ) . Take ( 2 ) . OrderByDescending ( r => r . Rank ) . ToList ( ) ;
@@ -427,7 +439,7 @@ public void TopNByRankTakeLessThanMaxTest()
427439 [ Test ]
428440 public void TopNByRankTakeMoreThanMaxTest ( )
429441 {
430- var keywords = "best greatestHits " ;
442+ var keywords = "black babbath back " ;
431443 var topNByRank = Session . Query . FreeText < Album > ( keywords , 3 ) ;
432444 Assert . IsTrue ( topNByRank . Count ( ) == 3 ) ;
433445 var topNByrankTakeMore = Session . Query . FreeText < Album > ( keywords , 3 ) . Take ( 4 ) . OrderByDescending ( r => r . Rank ) . ToList ( ) ;
0 commit comments