svn commit: r1477676 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/misc/ lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java

[jp...@apache.org]

Author: jpountz
Date: Tue Apr 30 14:52:52 2013
New Revision: 1477676

URL: http://svn.apache.org/r1477676
Log:
TestSortingMergePolicy: Fix test bug.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/misc/   (props changed)
    lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java

Modified: lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java?rev=1477676&r1=1477675&r2=1477676&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java Tue Apr 30 14:52:52 2013
@@ -37,6 +37,7 @@ import org.apache.lucene.index.LogMergeP
 import org.apache.lucene.index.MergePolicy;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.SegmentReader;
 import org.apache.lucene.index.SlowCompositeReaderWrapper;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.index.TieredMergePolicy;
@@ -105,19 +106,26 @@ public class TestSortingMergePolicy exte
     final RandomIndexWriter iw1 = new RandomIndexWriter(new Random(seed), dir1, iwc1);
     final RandomIndexWriter iw2 = new RandomIndexWriter(new Random(seed), dir2, iwc2);
     for (int i = 0; i < numDocs; ++i) {
+      if (random().nextInt(5) == 0 && i != numDocs - 1) {
+        final String term = RandomPicks.randomFrom(random(), terms);
+        iw1.deleteDocuments(new Term("s", term));
+        iw2.deleteDocuments(new Term("s", term));
+      }
       final Document doc = randomDocument();
       iw1.addDocument(doc);
       iw2.addDocument(doc);
-      if (i == numDocs / 2 || (i != numDocs - 1 && random().nextInt(8) == 0)) {
+      if (random().nextInt(8) == 0) {
         iw1.commit();
         iw2.commit();
       }
-      if (random().nextInt(5) == 0) {
-        final String term = RandomPicks.randomFrom(random(), terms);
-        iw1.deleteDocuments(new Term("s", term));
-        iw2.deleteDocuments(new Term("s", term));
-      }
     }
+    // Make sure we have something to merge
+    iw1.commit();
+    iw2.commit();
+    final Document doc = randomDocument();
+    iw1.addDocument(doc);
+    iw2.addDocument(doc);
+
     iw1.forceMerge(1);
     iw2.forceMerge(1);
     iw1.close();
@@ -138,7 +146,7 @@ public class TestSortingMergePolicy exte
   private static void assertSorted(AtomicReader reader) throws IOException {
     final NumericDocValues ndv = reader.getNumericDocValues("ndv");
     for (int i = 1; i < reader.maxDoc(); ++i) {
-      assertTrue(ndv.get(i-1) < ndv.get(i));
+      assertTrue(ndv.get(i-1) <= ndv.get(i));
     }
   }