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/15 22:29:59 UTC
svn commit: r1446782 - in /lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search: TestSort.java TestSortDocValues.java TestSortRandom.java TestTopFieldCollector.java TestTotalHitCountCollector.java

Author: rmuir
Date: Fri Feb 15 21:29:59 2013
New Revision: 1446782

URL: http://svn.apache.org/r1446782
Log:
LUCENE-4779: backport

Added:
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java   (props changed)
      - copied unchanged from r1446777, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java   (contents, props changed)
      - copied, changed from r1446778, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java   (contents, props changed)
      - copied, changed from r1446777, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java   (props changed)
      - copied unchanged from r1446777, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java   (props changed)
      - copied unchanged from r1446777, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java

Copied: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (from r1446778, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java?p2=lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java&r1=1446778&r2=1446782&rev=1446782&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java Fri Feb 15 21:29:59 2013
@@ -31,10 +31,12 @@ import org.apache.lucene.index.RandomInd
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 
 /** Tests basic sorting on docvalues fields.
  * These are mostly like TestSort's tests, except each test
  * indexes the field up-front as docvalues, and checks no fieldcaches were made */
+@SuppressCodecs("Lucene3x")
 public class TestSortDocValues extends LuceneTestCase {
   
   @Override

Copied: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (from r1446777, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java?p2=lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java&r1=1446777&r2=1446782&rev=1446782&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java Fri Feb 15 21:29:59 2013
@@ -80,9 +80,14 @@ public class TestSortRandom extends Luce
       }
       
       final Document doc = new Document();
-      doc.add(new SortedDocValuesField("stringdv", br));
-      doc.add(newStringField("string", s, Field.Store.NO));
-      doc.add(new NumericDocValuesField("id", numDocs));
+      if (defaultCodecSupportsDocValues()) {
+        doc.add(new SortedDocValuesField("stringdv", br));
+        doc.add(newStringField("string", s, Field.Store.NO));
+        doc.add(new NumericDocValuesField("id", numDocs));
+      } else {
+        doc.add(newStringField("string", s, Field.Store.NO));
+        doc.add(newStringField("id", Integer.toString(numDocs), Field.Store.NO));
+      }
       docValues.add(br);
       writer.addDocument(doc);
       numDocs++;
@@ -105,7 +110,7 @@ public class TestSortRandom extends Luce
       final boolean reverse = random.nextBoolean();
       final TopFieldDocs hits;
       final SortField sf;
-      if (random.nextBoolean()) {
+      if (defaultCodecSupportsDocValues() && random.nextBoolean()) {
         sf = new SortField("stringdv", SortField.Type.STRING, reverse);
       } else {
         sf = new SortField("string", SortField.Type.STRING, reverse);