You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/01/25 14:53:35 UTC

svn commit: r1438518 - /lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java

Author: mikemccand
Date: Fri Jan 25 13:53:35 2013
New Revision: 1438518

URL: http://svn.apache.org/viewvc?rev=1438518&view=rev
Log:
don't mix sorted/binary for testEmptyIndex string_dv

Modified:
    lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java

Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1438518&r1=1438517&r2=1438518&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestSort.java Fri Jan 25 13:53:35 2013
@@ -449,7 +449,11 @@ public class TestSort extends LuceneTest
   }
 
   private SortField.Type getDVStringSortType() {
-    if (dvStringSorted) {
+    return getDVStringSortType(true);
+  }
+
+  private SortField.Type getDVStringSortType(boolean allowSorted) {
+    if (dvStringSorted && allowSorted) {
       // If you index as sorted source you can still sort by
       // value instead:
       return random().nextBoolean() ? SortField.Type.STRING : SortField.Type.STRING_VAL;
@@ -702,14 +706,14 @@ public class TestSort extends LuceneTest
     sort.setSort(new SortField("float_dv", SortField.Type.FLOAT), new SortField("string", SortField.Type.STRING));
     assertMatches(empty, queryX, sort, "");
 
-    sort.setSort(new SortField("string_dv", getDVStringSortType(), true), SortField.FIELD_DOC);
+    sort.setSort(new SortField("string_dv", getDVStringSortType(false), true), SortField.FIELD_DOC);
     assertMatches(empty, queryX, sort, "");
 
     sort.setSort(new SortField("float_dv", SortField.Type.FLOAT),
-                  new SortField("string_dv", getDVStringSortType()));
+                  new SortField("string_dv", getDVStringSortType(false)));
     assertMatches(empty, queryX, sort, "");
     
-    sort.setSort(new SortField("float_dv", SortField.Type.FLOAT), new SortField("string_dv", getDVStringSortType()));
+    sort.setSort(new SortField("float_dv", SortField.Type.FLOAT), new SortField("string_dv", getDVStringSortType(false)));
     assertMatches(empty, queryX, sort, "");
   }