Skip to content

Commit 712a173

Browse files
ahornaceVladimir Kotal
ahornace
authored and
Vladimir Kotal
committed
Use junit5 in web
1 parent 52d1076 commit 712a173

26 files changed

+365
-368
lines changed

‎opengrok-indexer/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,6 @@ Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
149149
<version>3.1.6</version>
150150
<scope>test</scope>
151151
</dependency>
152-
<!--<dependency>
153-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
154-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
155-
<version>${jersey.version}</version>
156-
<scope>test</scope>
157-
</dependency>-->
158152
<dependency>
159153
<groupId>org.mockito</groupId>
160154
<artifactId>mockito-core</artifactId>

‎opengrok-web/pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
152152
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
153153
<version>${jersey.version}</version>
154154
<scope>test</scope>
155+
<exclusions>
156+
<exclusion>
157+
<groupId>junit</groupId>
158+
<artifactId>junit</artifactId>
159+
</exclusion>
160+
</exclusions>
155161
</dependency>
156162
<dependency>
157163
<groupId>org.mockito</groupId>
@@ -164,11 +170,6 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
164170
<artifactId>junit-jupiter-engine</artifactId>
165171
<scope>test</scope>
166172
</dependency>
167-
<dependency>
168-
<groupId>org.junit.vintage</groupId>
169-
<artifactId>junit-vintage-engine</artifactId>
170-
<scope>test</scope>
171-
</dependency>
172173
<dependency>
173174
<groupId>org.awaitility</groupId>
174175
<artifactId>awaitility</artifactId>

‎opengrok-web/src/test/java/org/opengrok/web/CookieFilterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import jakarta.servlet.http.HttpServletRequest;
3131
import jakarta.servlet.http.HttpServletResponse;
3232
import jakarta.ws.rs.core.HttpHeaders;
33-
import org.junit.Test;
33+
import org.junit.jupiter.api.Test;
3434

3535
import java.io.IOException;
3636
import java.io.PrintWriter;

‎opengrok-web/src/test/java/org/opengrok/web/CorsFilterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import jakarta.ws.rs.container.ContainerResponseContext;
2727
import jakarta.ws.rs.core.MultivaluedHashMap;
2828
import jakarta.ws.rs.core.MultivaluedMap;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.Test;
3030
import org.opengrok.web.api.v1.filter.CorsFilter;
3131

3232
import java.util.List;
3333

34-
import static org.junit.Assert.assertEquals;
34+
import static org.junit.jupiter.api.Assertions.assertEquals;
3535
import static org.mockito.Mockito.mock;
3636
import static org.mockito.Mockito.when;
3737
import static org.opengrok.web.api.v1.filter.CorsFilter.ALLOW_CORS_HEADER;

‎opengrok-web/src/test/java/org/opengrok/web/DirectoryListingTest.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
2222
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
2323
*/
2424
package org.opengrok.web;
@@ -35,9 +35,10 @@
3535
import java.util.List;
3636
import javax.xml.parsers.DocumentBuilder;
3737
import javax.xml.parsers.DocumentBuilderFactory;
38-
import org.junit.After;
39-
import org.junit.Before;
40-
import org.junit.Test;
38+
39+
import org.junit.jupiter.api.AfterEach;
40+
import org.junit.jupiter.api.BeforeEach;
41+
import org.junit.jupiter.api.Test;
4142
import org.opengrok.indexer.configuration.RuntimeEnvironment;
4243
import org.opengrok.indexer.history.HistoryException;
4344
import org.opengrok.indexer.history.RepositoryFactory;
@@ -48,10 +49,9 @@
4849
import org.w3c.dom.Node;
4950
import org.w3c.dom.NodeList;
5051

51-
import static org.junit.Assert.assertEquals;
52-
import static org.junit.Assert.assertNotNull;
53-
import static org.junit.Assert.assertTrue;
54-
import static org.junit.Assert.fail;
52+
import static org.junit.jupiter.api.Assertions.assertEquals;
53+
import static org.junit.jupiter.api.Assertions.assertNotNull;
54+
import static org.junit.jupiter.api.Assertions.assertTrue;
5555
import static org.mockito.ArgumentMatchers.anyString;
5656
import static org.mockito.Mockito.atLeast;
5757
import static org.mockito.Mockito.mock;
@@ -137,22 +137,21 @@ private void create() throws Exception {
137137

138138
if (subdirs != null && subdirs.size() > 0) {
139139
// this is a directory
140-
assertTrue("Failed to create a directory", file.mkdirs());
140+
assertTrue(file.mkdirs(), "Failed to create a directory");
141141
for (FileEntry entry : subdirs) {
142142
entry.name = name + File.separator + entry.name;
143143
entry.create();
144144
}
145145
} else {
146-
assertTrue("Failed to create file", file.createNewFile());
146+
assertTrue(file.createNewFile(), "Failed to create file");
147147
}
148148

149149
long val = lastModified;
150150
if (val == Long.MAX_VALUE) {
151151
val = System.currentTimeMillis();
152152
}
153153

154-
assertTrue("Failed to set modification time",
155-
file.setLastModified(val));
154+
assertTrue(file.setLastModified(val), "Failed to set modification time");
156155

157156
if (subdirs == null && size > 0) {
158157
try (FileOutputStream out = new FileOutputStream(file)) {
@@ -180,7 +179,7 @@ public int compareTo(FileEntry fe) {
180179
}
181180
}
182181

183-
@Before
182+
@BeforeEach
184183
public void setUp() throws Exception {
185184
directory = Files.createTempDirectory("directory").toFile();
186185

@@ -208,7 +207,7 @@ public void setUp() throws Exception {
208207
RepositoryFactory.initializeIgnoredNames(env);
209208
}
210209

211-
@After
210+
@AfterEach
212211
public void tearDown() {
213212
if (directory != null && directory.exists()) {
214213
removeDirectory(directory);
@@ -324,7 +323,7 @@ private void validateEntry(Element element) throws Exception {
324323
if (len < 5) {
325324
return;
326325
}
327-
assertEquals("list.jsp table <td> count", 7, len);
326+
assertEquals(7, len, "list.jsp table <td> count");
328327

329328
// item(0) is a decoration placeholder, i.e. no content
330329
entry.name = getFilename(nl.item(1));
@@ -340,7 +339,7 @@ private void validateEntry(Element element) throws Exception {
340339
}
341340
}
342341

343-
fail("Could not find a match for: " + entry.name);
342+
throw new AssertionError("Could not find a match for: " + entry.name);
344343
}
345344

346345
/**
@@ -358,10 +357,10 @@ public void directoryListing() throws Exception {
358357
Arrays.asList(directory.list()));
359358

360359
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
361-
assertNotNull("DocumentBuilderFactory is null", factory);
360+
assertNotNull(factory, "DocumentBuilderFactory is null");
362361

363362
DocumentBuilder builder = factory.newDocumentBuilder();
364-
assertNotNull("DocumentBuilder is null", builder);
363+
assertNotNull(builder, "DocumentBuilder is null");
365364

366365
out.append("</start>\n");
367366
String str = out.toString();

‎opengrok-web/src/test/java/org/opengrok/web/PageConfigRequestedProjectsTest.java

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919

2020
/*
21-
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
21+
* Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
2222
*/
2323
package org.opengrok.web;
2424

@@ -30,17 +30,18 @@
3030
import java.util.TreeSet;
3131

3232
import jakarta.servlet.http.HttpServletRequest;
33-
import org.junit.After;
34-
import org.junit.Assert;
35-
import org.junit.Before;
36-
import org.junit.Test;
33+
import org.junit.jupiter.api.AfterEach;
34+
import org.junit.jupiter.api.BeforeEach;
35+
import org.junit.jupiter.api.Test;
3736
import org.mockito.Mockito;
3837
import org.opengrok.indexer.authorization.AuthorizationStack;
3938
import org.opengrok.indexer.configuration.CommandTimeoutType;
4039
import org.opengrok.indexer.configuration.Group;
4140
import org.opengrok.indexer.configuration.Project;
4241
import org.opengrok.indexer.configuration.RuntimeEnvironment;
4342

43+
import static org.junit.jupiter.api.Assertions.assertEquals;
44+
4445
public class PageConfigRequestedProjectsTest {
4546

4647
final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
@@ -49,7 +50,7 @@ public class PageConfigRequestedProjectsTest {
4950
private Set<Group> oldGroups;
5051
private AuthorizationStack oldPluginStack;
5152

52-
@Before
53+
@BeforeEach
5354
public void setUp() {
5455
oldProjects = env.getProjects();
5556
oldGroups = env.getGroups();
@@ -86,7 +87,7 @@ public void setUp() {
8687
env.applyConfig(false, CommandTimeoutType.INDEXER);
8788
}
8889

89-
@After
90+
@AfterEach
9091
public void tearDown() {
9192
env.setProjects(oldProjects);
9293
env.setGroups(oldGroups);
@@ -98,15 +99,15 @@ public void testSingleProject() {
9899
final HttpServletRequest request = createRequest(new String[]{"project-1"}, null);
99100

100101
final PageConfig cfg = PageConfig.get(request);
101-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-1")), cfg.getRequestedProjects());
102+
assertEquals(new HashSet<>(Arrays.asList("project-1")), cfg.getRequestedProjects());
102103
}
103104

104105
@Test
105106
public void testMultipleProject() {
106107
final HttpServletRequest request = createRequest(new String[]{"project-1", "project-3", "project-6"}, null);
107108

108109
final PageConfig cfg = PageConfig.get(request);
109-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-1", "project-3", "project-6")), cfg.getRequestedProjects());
110+
assertEquals(new HashSet<>(Arrays.asList("project-1", "project-3", "project-6")), cfg.getRequestedProjects());
110111
}
111112

112113
@Test
@@ -115,7 +116,7 @@ public void testNonIndexedProject() {
115116
final HttpServletRequest request = createRequest(new String[]{"project-1"}, null);
116117

117118
final PageConfig cfg = PageConfig.get(request);
118-
Assert.assertEquals(new HashSet<>(), cfg.getRequestedProjects());
119+
assertEquals(new HashSet<>(), cfg.getRequestedProjects());
119120

120121
env.getProjects().get("project-1").setIndexed(true);
121122
}
@@ -126,7 +127,7 @@ public void testMultipleWithNonIndexedProject() {
126127
final HttpServletRequest request = createRequest(new String[]{"project-1", "project-3", "project-6"}, null);
127128

128129
final PageConfig cfg = PageConfig.get(request);
129-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-3", "project-6")), cfg.getRequestedProjects());
130+
assertEquals(new HashSet<>(Arrays.asList("project-3", "project-6")), cfg.getRequestedProjects());
130131

131132
env.getProjects().get("project-1").setIndexed(true);
132133
}
@@ -136,23 +137,23 @@ public void testSingleGroup1() {
136137
final HttpServletRequest request = createRequest(null, new String[]{"group-1-2-3"});
137138

138139
final PageConfig cfg = PageConfig.get(request);
139-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-1", "project-2", "project-3")), cfg.getRequestedProjects());
140+
assertEquals(new HashSet<>(Arrays.asList("project-1", "project-2", "project-3")), cfg.getRequestedProjects());
140141
}
141142

142143
@Test
143144
public void testSingleGroup2() {
144145
final HttpServletRequest request = createRequest(null, new String[]{"group-7-8-9"});
145146

146147
final PageConfig cfg = PageConfig.get(request);
147-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-7", "project-8", "project-9")), cfg.getRequestedProjects());
148+
assertEquals(new HashSet<>(Arrays.asList("project-7", "project-8", "project-9")), cfg.getRequestedProjects());
148149
}
149150

150151
@Test
151152
public void testMultipleGroup() {
152153
final HttpServletRequest request = createRequest(null, new String[]{"group-1-2-3", "group-7-8-9"});
153154

154155
final PageConfig cfg = PageConfig.get(request);
155-
Assert.assertEquals(new HashSet<>(Arrays.asList(
156+
assertEquals(new HashSet<>(Arrays.asList(
156157
"project-1", "project-2", "project-3",
157158
"project-7", "project-8", "project-9")), cfg.getRequestedProjects());
158159
}
@@ -162,7 +163,7 @@ public void testMixedGroupAndProjectAddingNewProjects() {
162163
final HttpServletRequest request = createRequest(new String[]{"project-1", "project-6"}, new String[]{"group-7-8-9"});
163164

164165
final PageConfig cfg = PageConfig.get(request);
165-
Assert.assertEquals(new HashSet<>(Arrays.asList(
166+
assertEquals(new HashSet<>(Arrays.asList(
166167
"project-1", "project-6",
167168
"project-7", "project-8", "project-9")), cfg.getRequestedProjects());
168169
}
@@ -173,7 +174,7 @@ public void testMixedGroupNonExistentGroupAndProjectAddingNewProjects() {
173174
final HttpServletRequest request = createRequest(new String[]{"project-1", "project-6"}, new String[]{"no-group", "group-7-8-9"});
174175

175176
final PageConfig cfg = PageConfig.get(request);
176-
Assert.assertEquals(new HashSet<>(Arrays.asList(
177+
assertEquals(new HashSet<>(Arrays.asList(
177178
"project-1", "project-6",
178179
"project-7", "project-8", "project-9")), cfg.getRequestedProjects());
179180
}
@@ -183,7 +184,7 @@ public void testMixedGroupAndProjectInclusion() {
183184
final HttpServletRequest request = createRequest(new String[]{"project-1", "project-2"}, new String[]{"group-1-2-3", "group-7-8-9"});
184185

185186
final PageConfig cfg = PageConfig.get(request);
186-
Assert.assertEquals(new HashSet<>(Arrays.asList(
187+
assertEquals(new HashSet<>(Arrays.asList(
187188
"project-1", "project-2", "project-3",
188189
"project-7", "project-8", "project-9")), cfg.getRequestedProjects());
189190
}
@@ -194,7 +195,7 @@ public void testNonIndexedInGroup() {
194195
final HttpServletRequest request = createRequest(null, new String[]{"group-1-2-3"});
195196

196197
final PageConfig cfg = PageConfig.get(request);
197-
Assert.assertEquals(new HashSet<>(Arrays.asList("project-2", "project-3")), cfg.getRequestedProjects());
198+
assertEquals(new HashSet<>(Arrays.asList("project-2", "project-3")), cfg.getRequestedProjects());
198199

199200
env.getProjects().get("project-1").setIndexed(true);
200201
}
@@ -207,7 +208,7 @@ public void testNonExistentProject() {
207208
final HttpServletRequest request = createRequest(new String[]{"no-project"}, null);
208209

209210
final PageConfig cfg = PageConfig.get(request);
210-
Assert.assertEquals(new HashSet<>(), cfg.getRequestedProjects());
211+
assertEquals(new HashSet<>(), cfg.getRequestedProjects());
211212
}
212213

213214
/**
@@ -218,7 +219,7 @@ public void testNonExistentGroup() {
218219
final HttpServletRequest request = createRequest(null, new String[]{"no-group"});
219220

220221
final PageConfig cfg = PageConfig.get(request);
221-
Assert.assertEquals(new HashSet<>(), cfg.getRequestedProjects());
222+
assertEquals(new HashSet<>(), cfg.getRequestedProjects());
222223
}
223224

224225
@Test
@@ -227,7 +228,7 @@ public void testSelectAllProjects() {
227228
Mockito.when(request.getParameter(PageConfig.ALL_PROJECT_SEARCH)).thenReturn("true");
228229

229230
final PageConfig cfg = PageConfig.get(request);
230-
Assert.assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
231+
assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
231232
}
232233

233234
@Test
@@ -236,7 +237,7 @@ public void testSelectAllProjectsOverrideProjectParam() {
236237
Mockito.when(request.getParameter(PageConfig.ALL_PROJECT_SEARCH)).thenReturn("true");
237238

238239
final PageConfig cfg = PageConfig.get(request);
239-
Assert.assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
240+
assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
240241
}
241242

242243
@Test
@@ -245,7 +246,7 @@ public void testSelectAllProjectsOverrideGroupParam() {
245246
Mockito.when(request.getParameter(PageConfig.ALL_PROJECT_SEARCH)).thenReturn("true");
246247

247248
final PageConfig cfg = PageConfig.get(request);
248-
Assert.assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
249+
assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
249250
}
250251

251252
@Test
@@ -254,7 +255,7 @@ public void testSelectAllOverrideNonExistentProject() {
254255
Mockito.when(request.getParameter(PageConfig.ALL_PROJECT_SEARCH)).thenReturn("true");
255256

256257
final PageConfig cfg = PageConfig.get(request);
257-
Assert.assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
258+
assertEquals(new TreeSet<>(env.getProjectNames()), cfg.getRequestedProjects());
258259
}
259260

260261
/**

0 commit comments

Comments
 (0)