You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/02/14 17:13:06 UTC
svn commit: r1446257 - in
/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search:
TestSort.java TestSort2.java
Author: rmuir
Date: Thu Feb 14 16:13:05 2013
New Revision: 1446257
URL: http://svn.apache.org/r1446257
Log:
LUCENE-4779: factor out testEmptyIndex
Modified:
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort2.java
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1446257&r1=1446256&r2=1446257&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java Thu Feb 14 16:13:05 2013
@@ -351,11 +351,6 @@ public class TestSort extends LuceneTest
return getIndex(false, true);
}
- private IndexSearcher getEmptyIndex()
- throws IOException {
- return getIndex(false, false);
- }
-
// Set to true if the DV "string" field is indexed as a
// sorted source:
private boolean dvStringSorted;
@@ -710,42 +705,6 @@ public class TestSort extends LuceneTest
fc.purgeAllCaches();
}
- // test sorts when there's nothing in the index
- public void testEmptyIndex() throws Exception {
- IndexSearcher empty = getEmptyIndex();
-
- sort = new Sort();
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(SortField.FIELD_DOC);
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("int", SortField.Type.INT), SortField.FIELD_DOC);
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("int_dv", SortField.Type.INT), SortField.FIELD_DOC);
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("string", SortField.Type.STRING, true), SortField.FIELD_DOC);
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("float", SortField.Type.FLOAT), new SortField("string", SortField.Type.STRING));
- assertMatches(empty, queryX, sort, "");
-
- 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(false), true), SortField.FIELD_DOC);
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("float_dv", SortField.Type.FLOAT),
- new SortField("string_dv", getDVStringSortType(false)));
- assertMatches(empty, queryX, sort, "");
-
- sort.setSort(new SortField("float_dv", SortField.Type.FLOAT), new SortField("string_dv", getDVStringSortType(false)));
- assertMatches(empty, queryX, sort, "");
- }
-
static class MyFieldComparator extends FieldComparator<Integer> {
FieldCache.Ints docValues;
int[] slotValues;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort2.java?rev=1446257&r1=1446256&r2=1446257&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort2.java Thu Feb 14 16:13:05 2013
@@ -27,6 +27,7 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
@@ -157,4 +158,34 @@ public class TestSort2 extends LuceneTes
r.close();
d.close();
}
+
+ // test sorts when there's nothing in the index
+ public void testEmptyIndex() throws Exception {
+ IndexSearcher empty = new IndexSearcher(new MultiReader());
+ Query query = new TermQuery(new Term("contents", "foo"));
+
+ Sort sort = new Sort();
+ TopDocs td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+
+ sort.setSort(SortField.FIELD_DOC);
+ td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+
+ sort.setSort(new SortField("int", SortField.Type.INT), SortField.FIELD_DOC);
+ td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+
+ sort.setSort(new SortField("string", SortField.Type.STRING, true), SortField.FIELD_DOC);
+ td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+
+ sort.setSort(new SortField("string_val", SortField.Type.STRING_VAL, true), SortField.FIELD_DOC);
+ td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+
+ sort.setSort(new SortField("float", SortField.Type.FLOAT), new SortField("string", SortField.Type.STRING));
+ td = empty.search(query, null, 10, sort, true, true);
+ assertEquals(0, td.totalHits);
+ }
}