Skip to content

Commit 2936214

Browse files
anotherdaveVladimir Kotal
authored andcommitted
Fix SuggesterTest and ChronicleMapAdapterTest failing under Windows
1 parent 4dc670b commit 2936214

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

suggester/src/test/java/org/opengrok/suggest/SuggesterTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.nio.file.Path;
4747
import java.time.Duration;
4848
import java.util.AbstractMap.SimpleEntry;
49+
import java.util.ArrayList;
4950
import java.util.Collections;
5051
import java.util.List;
5152
import java.util.Map;
@@ -67,9 +68,13 @@ private static class SuggesterTestData {
6768
private Suggester s;
6869
private Path indexDir;
6970
private Path suggesterDir;
71+
private List<Suggester.NamedIndexReader> namedIndexReaders = new ArrayList<>();
7072

7173

7274
private void close() throws IOException {
75+
for (Suggester.NamedIndexReader ir: namedIndexReaders) {
76+
ir.getReader().close();
77+
}
7378
s.close();
7479
FileUtils.deleteDirectory(indexDir.toFile());
7580
FileUtils.deleteDirectory(suggesterDir.toFile());
@@ -84,7 +89,9 @@ private Directory getIndexDirectory() throws IOException {
8489
}
8590

8691
private Suggester.NamedIndexReader getNamedIndexReader() throws IOException {
87-
return new Suggester.NamedIndexReader("test", DirectoryReader.open(getIndexDirectory()));
92+
Suggester.NamedIndexReader ir = new Suggester.NamedIndexReader("test", DirectoryReader.open(getIndexDirectory()));
93+
namedIndexReaders.add(ir);
94+
return ir;
8895
}
8996

9097
}

suggester/src/test/java/org/opengrok/suggest/popular/impl/ChronicleMapAdapterTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public void setUp() throws IOException {
5656

5757
@After
5858
public void tearDown() throws IOException {
59+
map.close();
5960
Files.delete(tempFile);
6061
}
6162

0 commit comments

Comments
 (0)