svn commit: r1066008 - /lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java

[mi...@apache.org]

Author: mikemccand
Date: Tue Feb  1 11:41:49 2011
New Revision: 1066008

URL: http://svn.apache.org/viewvc?rev=1066008&view=rev
Log:
make MockRandomMergePolicy slightly less evil; fixes 2 recent test failures

Modified:
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1066008&r1=1066007&r2=1066008&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/MockRandomMergePolicy.java Tue Feb  1 11:41:49 2011
@@ -67,7 +67,8 @@ public class MockRandomMergePolicy exten
       Collections.shuffle(segmentInfos2, random);
       int upto = 0;
       while(upto < segmentInfos.size()) {
-        int inc = _TestUtil.nextInt(random, 1, segmentInfos.size()-upto);
+        int max = Math.min(10, segmentInfos.size()-upto);
+        int inc = max <= 2 ? max : _TestUtil.nextInt(random, 2, max);
         mergeSpec.add(new OneMerge(segmentInfos2.range(upto, upto+inc)));
         upto += inc;
       }
@@ -88,6 +89,7 @@ public class MockRandomMergePolicy exten
 
   @Override
   public boolean useCompoundFile(SegmentInfos infos, SegmentInfo mergedInfo) throws IOException {
-    return random.nextBoolean();
+    // 80% of the time we create CFS:
+    return random.nextInt(5) != 1;
   }
 }