svn commit: r1605002 - /lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

[mi...@apache.org]

Author: mikemccand
Date: Tue Jun 24 03:56:54 2014
New Revision: 1605002

URL: http://svn.apache.org/r1605002
Log:
fix test bug

Modified:
    lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1605002&r1=1605001&r2=1605002&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Tue Jun 24 03:56:54 2014
@@ -329,14 +329,17 @@ public class TestConcurrentMergeSchedule
 
   private static class TrackingCMS extends ConcurrentMergeScheduler {
     long totMergedBytes;
+    CountDownLatch atLeastOneMerge;
 
-    public TrackingCMS() {
+    public TrackingCMS(CountDownLatch atLeastOneMerge) {
       setMaxMergesAndThreads(5, 5);
+      this.atLeastOneMerge = atLeastOneMerge;
     }
 
     @Override
     public void doMerge(MergePolicy.OneMerge merge) throws IOException {
       totMergedBytes += merge.totalBytesSize();
+      atLeastOneMerge.countDown();
       super.doMerge(merge);
     }
   }
@@ -348,7 +351,8 @@ public class TestConcurrentMergeSchedule
     }
     IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
     iwc.setMaxBufferedDocs(5);
-    iwc.setMergeScheduler(new TrackingCMS());
+    CountDownLatch atLeastOneMerge = new CountDownLatch(1);
+    iwc.setMergeScheduler(new TrackingCMS(atLeastOneMerge));
     if (TestUtil.getPostingsFormat("id").equals("SimpleText")) {
       // no
       iwc.setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat()));
@@ -363,6 +367,7 @@ public class TestConcurrentMergeSchedule
         w.deleteDocuments(new Term("id", ""+random().nextInt(i+1)));
       }
     }
+    atLeastOneMerge.await();
     assertTrue(((TrackingCMS) w.getConfig().getMergeScheduler()).totMergedBytes != 0);
     w.close();
     d.close();