Skip to content

Commit 7ef04fd

Browse files
ahornaceVladimir Kotal
ahornace
authored and
Vladimir Kotal
committed
Use junit5 in suggester
1 parent d219b4c commit 7ef04fd

18 files changed

+84
-79
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
7070
<!-- Jackson version needs to match the version of Jackson which Jersey
7171
depends on or otherwise weird things will happen. -->
7272
<jackson.version>2.11.3</jackson.version>
73-
<junit.version>5.7.0</junit.version>
73+
<junit.version>5.7.1</junit.version>
7474
<hamcrest.version>2.1</hamcrest.version>
7575
<maven-surefire.version>2.22.2</maven-surefire.version>
7676
<apache-commons-lang3.version>3.9</apache-commons-lang3.version>

‎suggester/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
8686
<scope>test</scope>
8787
</dependency>
8888

89-
<dependency>
90-
<groupId>org.junit.vintage</groupId>
91-
<artifactId>junit-vintage-engine</artifactId>
92-
<scope>test</scope>
93-
</dependency>
94-
9589
<dependency>
9690
<groupId>net.openhft</groupId>
9791
<artifactId>chronicle-map</artifactId>

‎suggester/src/test/java/org/opengrok/suggest/LookupPriorityQueueTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
*/
2323
package org.opengrok.suggest;
2424

25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626

2727
import java.util.stream.Collectors;
2828

2929
import static org.hamcrest.MatcherAssert.assertThat;
3030
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
31-
import static org.junit.Assert.assertFalse;
32-
import static org.junit.Assert.assertTrue;
31+
import static org.junit.jupiter.api.Assertions.assertFalse;
32+
import static org.junit.jupiter.api.Assertions.assertTrue;
3333

3434
public class LookupPriorityQueueTest {
3535

‎suggester/src/test/java/org/opengrok/suggest/LookupResultItemTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
*/
2323
package org.opengrok.suggest;
2424

25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626

2727
import static org.hamcrest.MatcherAssert.assertThat;
2828
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
29-
import static org.junit.Assert.assertEquals;
29+
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import static org.junit.jupiter.api.Assertions.assertThrows;
3031

3132
public class LookupResultItemTest {
3233

@@ -42,11 +43,11 @@ public void combineTest() {
4243
assertThat(item1.getProjects(), containsInAnyOrder("proj1", "proj2"));
4344
}
4445

45-
@Test(expected = IllegalArgumentException.class)
46+
@Test
4647
public void combineNullTest() {
4748
LookupResultItem item = new LookupResultItem("p1", "proj1", 2);
4849

49-
item.combine(null);
50+
assertThrows(IllegalArgumentException.class, () -> item.combine(null));
5051
}
5152

5253
}

‎suggester/src/test/java/org/opengrok/suggest/SuggesterProjectDataTest.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.apache.lucene.store.Directory;
3535
import org.apache.lucene.util.BytesRef;
3636
import org.hamcrest.Matchers;
37-
import org.junit.After;
38-
import org.junit.Before;
39-
import org.junit.Test;
37+
import org.junit.jupiter.api.AfterEach;
38+
import org.junit.jupiter.api.BeforeEach;
39+
import org.junit.jupiter.api.Test;
4040

4141
import java.io.IOException;
4242
import java.nio.file.Files;
@@ -49,12 +49,13 @@
4949
import java.util.Map.Entry;
5050
import java.util.stream.Collectors;
5151

52-
import static junit.framework.TestCase.assertEquals;
53-
import static junit.framework.TestCase.assertFalse;
5452
import static org.hamcrest.MatcherAssert.assertThat;
5553
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
5654
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
57-
import static org.junit.Assert.assertTrue;
55+
import static org.junit.jupiter.api.Assertions.assertEquals;
56+
import static org.junit.jupiter.api.Assertions.assertFalse;
57+
import static org.junit.jupiter.api.Assertions.assertThrows;
58+
import static org.junit.jupiter.api.Assertions.assertTrue;
5859

5960
public class SuggesterProjectDataTest {
6061

@@ -66,13 +67,13 @@ public class SuggesterProjectDataTest {
6667

6768
private SuggesterProjectData data;
6869

69-
@Before
70+
@BeforeEach
7071
public void setUp() throws IOException {
7172
dir = new ByteBuffersDirectory();
7273
tempDir = Files.createTempDirectory("test");
7374
}
7475

75-
@After
76+
@AfterEach
7677
public void tearDown() throws IOException {
7778
if (data != null) {
7879
data.close();
@@ -205,13 +206,14 @@ public void incrementByValueTest() throws IOException {
205206
assertEquals(20, data.getSearchCounts(FIELD).get(new BytesRef("some")));
206207
}
207208

208-
@Test(expected = IllegalArgumentException.class)
209+
@Test
209210
public void incrementByNegativeValueTest() throws IOException {
210211
addText(FIELD, "another text example");
211212

212213
init(true);
213214

214-
data.incrementSearchCount(new Term(FIELD, "example"), -10);
215+
assertThrows(IllegalArgumentException.class,
216+
() -> data.incrementSearchCount(new Term(FIELD, "example"), -10));
215217
}
216218

217219
@Test
@@ -245,12 +247,12 @@ public void initAfterChangingIndexTest() throws IOException {
245247
assertThat(getSuggestions(FIELD, "t", 2), containsInAnyOrder("term", "term2"));
246248
}
247249

248-
@Test(expected = IllegalArgumentException.class)
250+
@Test
249251
public void incrementSearchCountNullTest() throws IOException {
250252
addText(FIELD, "term");
251253
init(false);
252254

253-
data.incrementSearchCount(null);
255+
assertThrows(IllegalArgumentException.class, () -> data.incrementSearchCount(null));
254256
}
255257

256258
@Test

‎suggester/src/test/java/org/opengrok/suggest/SuggesterSearcherTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.apache.lucene.store.ByteBuffersDirectory;
3535
import org.apache.lucene.store.Directory;
3636
import org.apache.lucene.util.BytesRef;
37-
import org.junit.AfterClass;
38-
import org.junit.BeforeClass;
39-
import org.junit.Test;
37+
import org.junit.jupiter.api.AfterAll;
38+
import org.junit.jupiter.api.BeforeAll;
39+
import org.junit.jupiter.api.Test;
4040
import org.opengrok.suggest.query.SuggesterFuzzyQuery;
4141
import org.opengrok.suggest.query.SuggesterPhraseQuery;
4242
import org.opengrok.suggest.query.SuggesterPrefixQuery;
@@ -58,7 +58,7 @@ public class SuggesterSearcherTest {
5858

5959
private static SuggesterSearcher searcher;
6060

61-
@BeforeClass
61+
@BeforeAll
6262
public static void setUpClass() throws IOException {
6363
dir = new ByteBuffersDirectory();
6464

@@ -78,7 +78,7 @@ public static void setUpClass() throws IOException {
7878
searcher = new SuggesterSearcher(ir, 10);
7979
}
8080

81-
@AfterClass
81+
@AfterAll
8282
public static void tearDownClass() throws IOException {
8383
dir.close();
8484
}

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

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.apache.lucene.store.Directory;
4040
import org.apache.lucene.store.FSDirectory;
4141
import org.apache.lucene.util.BytesRef;
42-
import org.junit.Test;
42+
import org.junit.jupiter.api.Test;
4343
import org.opengrok.suggest.query.SuggesterPrefixQuery;
4444
import org.opengrok.suggest.query.SuggesterWildcardQuery;
4545

@@ -60,8 +60,9 @@
6060
import static org.hamcrest.MatcherAssert.assertThat;
6161
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
6262
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
63-
import static org.junit.Assert.assertFalse;
64-
import static org.junit.Assert.assertTrue;
63+
import static org.junit.jupiter.api.Assertions.assertFalse;
64+
import static org.junit.jupiter.api.Assertions.assertThrows;
65+
import static org.junit.jupiter.api.Assertions.assertTrue;
6566

6667
public class SuggesterTest {
6768

@@ -99,29 +100,34 @@ private Suggester.NamedIndexReader getNamedIndexReader() throws IOException {
99100

100101
}
101102

102-
@Test(expected = IllegalArgumentException.class)
103+
@Test
103104
public void testNullSuggesterDir() {
104-
new Suggester(null, 10, Duration.ofMinutes(5), false, true, null, Integer.MAX_VALUE, 1, registry);
105+
assertThrows(IllegalArgumentException.class,
106+
() -> new Suggester(null, 10, Duration.ofMinutes(5), false, true, null, Integer.MAX_VALUE, 1, registry));
105107
}
106108

107-
@Test(expected = IllegalArgumentException.class)
108-
public void testNullDuration() throws IOException {
109-
Path tempFile = Files.createTempFile("opengrok", "test");
110-
try {
111-
new Suggester(tempFile.toFile(), 10, null, false, true, null, Integer.MAX_VALUE, 1, registry);
112-
} finally {
113-
tempFile.toFile().delete();
114-
}
109+
@Test
110+
public void testNullDuration() {
111+
assertThrows(IllegalArgumentException.class, () -> {
112+
Path tempFile = Files.createTempFile("opengrok", "test");
113+
try {
114+
new Suggester(tempFile.toFile(), 10, null, false, true, null, Integer.MAX_VALUE, 1, registry);
115+
} finally {
116+
tempFile.toFile().delete();
117+
}
118+
});
115119
}
116120

117-
@Test(expected = IllegalArgumentException.class)
118-
public void testNegativeDuration() throws IOException {
119-
Path tempFile = Files.createTempFile("opengrok", "test");
120-
try {
121-
new Suggester(tempFile.toFile(), 10, Duration.ofMinutes(-4), false, true, null, Integer.MAX_VALUE, 1, registry);
122-
} finally {
123-
tempFile.toFile().delete();
124-
}
121+
@Test
122+
public void testNegativeDuration() {
123+
assertThrows(IllegalArgumentException.class, () -> {
124+
Path tempFile = Files.createTempFile("opengrok", "test");
125+
try {
126+
new Suggester(tempFile.toFile(), 10, Duration.ofMinutes(-4), false, true, null, Integer.MAX_VALUE, 1, registry);
127+
} finally {
128+
tempFile.toFile().delete();
129+
}
130+
});
125131
}
126132

127133
private SuggesterTestData initSuggester() throws IOException {

‎suggester/src/test/java/org/opengrok/suggest/SuggesterUtilsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.lucene.search.PhraseQuery;
2929
import org.apache.lucene.search.Query;
3030
import org.apache.lucene.search.TermQuery;
31-
import org.junit.Test;
31+
import org.junit.jupiter.api.Test;
3232
import org.opengrok.suggest.query.SuggesterPrefixQuery;
3333

3434
import java.util.Arrays;
@@ -37,8 +37,8 @@
3737
import static org.hamcrest.MatcherAssert.assertThat;
3838
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
3939
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
40-
import static org.junit.Assert.assertEquals;
41-
import static org.junit.Assert.assertFalse;
40+
import static org.junit.jupiter.api.Assertions.assertEquals;
41+
import static org.junit.jupiter.api.Assertions.assertFalse;
4242

4343
public class SuggesterUtilsTest {
4444

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
package org.opengrok.suggest.popular.impl;
2424

2525
import org.apache.lucene.util.BytesRef;
26-
import org.junit.After;
27-
import org.junit.Before;
28-
import org.junit.Test;
26+
import org.junit.jupiter.api.AfterEach;
27+
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Test;
2929
import org.opengrok.suggest.popular.impl.chronicle.ChronicleMapAdapter;
3030

3131
import java.io.IOException;
@@ -37,7 +37,7 @@
3737

3838
import static org.hamcrest.MatcherAssert.assertThat;
3939
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
40-
import static org.junit.Assert.assertEquals;
40+
import static org.junit.jupiter.api.Assertions.assertEquals;
4141

4242
public class ChronicleMapAdapterTest {
4343

@@ -47,14 +47,14 @@ public class ChronicleMapAdapterTest {
4747

4848
private Path tempFile;
4949

50-
@Before
50+
@BeforeEach
5151
public void setUp() throws IOException {
5252
tempFile = Files.createTempFile("opengrok", "test");
5353

5454
map = new ChronicleMapAdapter(FIELD, 3, 10, tempFile.toFile());
5555
}
5656

57-
@After
57+
@AfterEach
5858
public void tearDown() throws IOException {
5959
map.close();
6060
Files.delete(tempFile);

‎suggester/src/test/java/org/opengrok/suggest/popular/impl/ChronicleMapConfigurationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
*/
2323
package org.opengrok.suggest.popular.impl;
2424

25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626
import org.opengrok.suggest.popular.impl.chronicle.ChronicleMapConfiguration;
2727

2828
import java.io.IOException;
2929
import java.nio.file.Files;
3030
import java.nio.file.Path;
3131

32-
import static org.junit.Assert.assertEquals;
32+
import static org.junit.jupiter.api.Assertions.assertEquals;
3333

3434
public class ChronicleMapConfigurationTest {
3535

0 commit comments

Comments
 (0)