You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2020/06/25 09:35:23 UTC
[lucene-solr] branch jira/lucene-8962 updated: fix test
This is an automated email from the ASF dual-hosted git repository.
simonw pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/lucene-8962 by this push:
new 4e17717 fix test
4e17717 is described below
commit 4e17717fb2c986fb4e199830df89dfa4012811a7
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Thu Jun 25 11:35:07 2020 +0200
fix test
---
.../core/src/test/org/apache/lucene/index/TestMergePolicy.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java
index b6d595c..93a9b17 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicy.java
@@ -43,7 +43,7 @@ public class TestMergePolicy extends LuceneTestCase {
Thread t = new Thread(() -> {
try {
for (MergePolicy.OneMerge m : ms.merges) {
- m.mergeFinished(true, false);
+ m.close(true, false, mr -> {});
}
} catch (IOException e) {
throw new AssertionError(e);
@@ -66,7 +66,7 @@ public class TestMergePolicy extends LuceneTestCase {
}
Thread t = new Thread(() -> {
try {
- ms.merges.get(0).mergeFinished(true, false);
+ ms.merges.get(0).close(true, false, mr -> {});
} catch (IOException e) {
throw new AssertionError(e);
}
@@ -89,7 +89,7 @@ public class TestMergePolicy extends LuceneTestCase {
Thread t = new Thread(() -> {
while (stop.get() == false) {
try {
- ms.merges.get(i.getAndIncrement()).mergeFinished(true, false);
+ ms.merges.get(i.getAndIncrement()).close(true, false, mr -> {});
Thread.sleep(1);
} catch (IOException | InterruptedException e) {
throw new AssertionError(e);
@@ -114,8 +114,8 @@ public class TestMergePolicy extends LuceneTestCase {
try (Directory dir = newDirectory()) {
MergePolicy.MergeSpecification spec = createRandomMergeSpecification(dir, 1);
MergePolicy.OneMerge oneMerge = spec.merges.get(0);
- oneMerge.mergeFinished(true, false);
- expectThrows(IllegalStateException.class, () -> oneMerge.mergeFinished(false, false));
+ oneMerge.close(true, false, mr -> {});
+ expectThrows(IllegalStateException.class, () -> oneMerge.close(false, false, mr -> {}));
}
}