Skip to content

Commit 7aa2f01

Browse files
stevehustevehu
committed
fixes #74 upgrade junit to version 5
1 parent aa33288 commit 7aa2f01

14 files changed

Lines changed: 114 additions & 132 deletions

‎pom.xml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<version.jackson>2.18.3</version.jackson>
101101
<version.slf4j>2.0.17</version.slf4j>
102102
<version.logback>1.5.26</version.logback>
103-
<version.junit>4.13.2</version.junit>
103+
<version.junit>5.11.4</version.junit>
104104
<version.jsonassert>1.5.0</version.jsonassert>
105105
<version.guava>33.4.8-jre</version.guava>
106106
<version.javax.annotation>1.3.2</version.javax.annotation>
@@ -149,8 +149,8 @@
149149
<scope>test</scope>
150150
</dependency>
151151
<dependency>
152-
<groupId>junit</groupId>
153-
<artifactId>junit</artifactId>
152+
<groupId>org.junit.jupiter</groupId>
153+
<artifactId>junit-jupiter</artifactId>
154154
<version>${version.junit}</version>
155155
<scope>test</scope>
156156
</dependency>
@@ -241,14 +241,7 @@
241241
<plugin>
242242
<groupId>org.apache.maven.plugins</groupId>
243243
<artifactId>maven-surefire-plugin</artifactId>
244-
<version>2.19.1</version>
245-
<dependencies>
246-
<dependency>
247-
<groupId>org.apache.maven.surefire</groupId>
248-
<artifactId>surefire-junit47</artifactId>
249-
<version>2.19.1</version>
250-
</dependency>
251-
</dependencies>
244+
<version>3.5.2</version>
252245
</plugin>
253246

254247

@@ -285,7 +278,7 @@
285278
<plugin>
286279
<groupId>org.apache.maven.plugins</groupId>
287280
<artifactId>maven-surefire-report-plugin</artifactId>
288-
<version>2.19.1</version>
281+
<version>3.5.2</version>
289282
</plugin>
290283
</plugins>
291284
</reporting>

‎src/test/java/com/networknt/oas/BigParseTest.java‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@
1616
import com.networknt.jsonoverlay.JsonOverlay;
1717
import com.networknt.jsonoverlay.Overlay;
1818
import com.networknt.oas.model.OpenApi3;
19-
import org.junit.Assert;
20-
import org.junit.Test;
21-
import org.junit.runner.RunWith;
22-
import org.junit.runners.Parameterized;
23-
import org.junit.runners.Parameterized.Parameter;
24-
import org.junit.runners.Parameterized.Parameters;
19+
import org.junit.jupiter.params.ParameterizedTest;
20+
import org.junit.jupiter.params.provider.MethodSource;
2521
import org.yaml.snakeyaml.Yaml;
2622

2723
import java.net.URL;
2824
import java.util.Arrays;
2925
import java.util.Collection;
26+
import java.util.stream.Stream;
3027
import com.google.common.base.Predicate;
3128

29+
import static org.junit.jupiter.api.Assertions.*;
30+
3231
/**
3332
* Tests basic parser operation by loading a swagger spec and then verifying
3433
* that all values can be obtained reliably from the model
@@ -37,19 +36,15 @@
3736
*
3837
*/
3938

40-
@RunWith(Parameterized.class)
41-
public class BigParseTest extends Assert {
39+
public class BigParseTest {
4240

43-
@Parameters
44-
public static Collection<Object[]> resources() {
45-
return Arrays.asList(new Object[][] { new URL[] { BigParseTest.class.getResource("/models/parseTest.yaml") } });
41+
public static Stream<URL> resources() {
42+
return Stream.of(BigParseTest.class.getResource("/models/parseTest.yaml"));
4643
}
4744

48-
@Parameter
49-
public URL modelUrl;
50-
51-
@Test
52-
public void test() throws Exception {
45+
@ParameterizedTest
46+
@MethodSource("resources")
47+
public void test(URL modelUrl) throws Exception {
5348
Object parsedYaml = new Yaml().load(modelUrl.openStream());
5449
JsonNode tree = new YAMLMapper().convertValue(parsedYaml, JsonNode.class);
5550
final OpenApi3 model = (OpenApi3) new OpenApiParser().parse(modelUrl, false);
@@ -65,11 +60,11 @@ public void run(JsonNode node, JsonPointer path) {
6560
@SuppressWarnings("unchecked")
6661
JsonOverlay<?> overlay = Overlay.find((JsonOverlay<OpenApi3>) model, path);
6762
Object value = overlay != null ? Overlay.get(overlay) : null;
68-
assertNotNull("No overlay object found for path: " + path, overlay);
63+
assertNotNull(overlay, "No overlay object found for path: " + path);
6964
Object fromJson = getValue(node);
7065
String msg = String.format("Wrong overlay value for path '%s': expected '%s', got '%s'", path, fromJson,
7166
value);
72-
assertEquals(msg, fromJson, value);
67+
assertEquals(fromJson, value, msg);
7368
}
7469
};
7570
JsonTreeWalker.walkTree(tree, valueNodePredicate, valueChecker);

‎src/test/java/com/networknt/oas/CircularTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
package com.networknt.oas;
1212

1313
import com.networknt.oas.model.OpenApi3;
14-
import org.junit.Test;
14+
import org.junit.jupiter.api.Test;
1515

16-
import static org.junit.Assert.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertEquals;
1717

1818
public class CircularTest {
1919
@Test

‎src/test/java/com/networknt/oas/ExampleTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
import com.google.common.io.Resources;
1515
import com.networknt.oas.model.Example;
1616
import com.networknt.oas.model.OpenApi3;
17-
import org.junit.BeforeClass;
18-
import org.junit.Test;
17+
import org.junit.jupiter.api.BeforeAll;
18+
import org.junit.jupiter.api.Test;
1919

2020
import java.util.Map;
2121

22-
import static org.junit.Assert.assertEquals;
23-
import static org.junit.Assert.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2424

2525
public class ExampleTest {
2626

@@ -30,7 +30,7 @@ public class ExampleTest {
3030
"person", ImmutableMap.<String, Object>of( //
3131
"name", "Paul"));
3232

33-
@BeforeClass
33+
@BeforeAll
3434
public static void beforeClass() throws Exception {
3535
model = (OpenApi3) new OpenApiParser().parse(Resources.getResource("models/examplesTest.yaml"), true);
3636
}

‎src/test/java/com/networknt/oas/ExamplesTest.java‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@
1414
import com.networknt.jsonoverlay.JsonLoader;
1515
import com.networknt.oas.model.OpenApi3;
1616
import com.networknt.oas.validator.ValidationResults.ValidationItem;
17-
import org.junit.Assert;
18-
import org.junit.Test;
19-
import org.junit.runner.RunWith;
20-
import org.junit.runners.Parameterized;
21-
import org.junit.runners.Parameterized.Parameter;
22-
import org.junit.runners.Parameterized.Parameters;
17+
import org.junit.jupiter.api.Assumptions;
18+
import org.junit.jupiter.api.Test;
2319
import com.google.common.collect.Lists;
2420
import com.google.common.collect.Queues;
2521

@@ -29,15 +25,15 @@
2925
import java.util.Deque;
3026
import java.util.Iterator;
3127

32-
@RunWith(Parameterized.class)
33-
public class ExamplesTest extends Assert {
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
29+
30+
public class ExamplesTest {
3431

3532
private static final String SPEC_REPO = "OAI/OpenAPI-specification";
3633
private static final String EXAMPLES_BRANCH = "main";
3734
private static final String EXAMPLES_ROOT = "tests/md2html";
3835

39-
@Parameters(name = "{index}: {1}")
40-
public static Collection<Object[]> findExamples() throws IOException {
36+
private static Collection<Object[]> findExamples() throws IOException {
4137
Collection<Object[]> examples = Lists.newArrayList();
4238
Deque<URL> dirs = Queues.newArrayDeque();
4339
String auth = System.getenv("GITHUB_AUTH") != null ? System.getenv("GITHUB_AUTH") + "@" : "";
@@ -62,20 +58,19 @@ public static Collection<Object[]> findExamples() throws IOException {
6258
return examples;
6359
}
6460

65-
@Parameter
66-
public URL exampleUrl;
67-
68-
@Parameter(1)
69-
public String fileName;
70-
7161
@Test
7262
public void exampleCanBeParsed() throws Exception {
73-
if (!exampleUrl.toString().contains("callback-example")) {
74-
OpenApi3 model = (OpenApi3) new OpenApiParser().parse(exampleUrl);
75-
for (ValidationItem item : model.getValidationItems()) {
76-
System.out.println(item);
63+
Collection<Object[]> examples = findExamples();
64+
Assumptions.assumeFalse(examples.isEmpty(), "No examples found (GITHUB_AUTH may not be set)");
65+
for (Object[] example : examples) {
66+
URL exampleUrl = (URL) example[0];
67+
if (!exampleUrl.toString().contains("callback-example")) {
68+
OpenApi3 model = (OpenApi3) new OpenApiParser().parse(exampleUrl);
69+
for (ValidationItem item : model.getValidationItems()) {
70+
System.out.println(item);
71+
}
72+
assertTrue(model.isValid(), "Example was not valid: " + exampleUrl);
7773
}
78-
assertTrue("Example was not valid: " + exampleUrl, model.isValid());
7974
}
8075
}
8176

‎src/test/java/com/networknt/oas/Issue131Test.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
import com.networknt.jsonoverlay.Overlay;
1414
import com.networknt.oas.model.OpenApi3;
1515
import com.networknt.oas.model.Schema;
16-
import org.junit.Assert;
17-
import org.junit.Test;
16+
import org.junit.jupiter.api.Test;
1817

1918
import com.google.common.io.Resources;
2019

21-
public class Issue131Test extends Assert {
20+
import static org.junit.jupiter.api.Assertions.*;
21+
22+
public class Issue131Test {
2223

2324
@Test
2425
public void testSchemaRefs() throws Exception {
@@ -29,7 +30,7 @@ public void testSchemaRefs() throws Exception {
2930
Schema viaMoreData = model.getSchema("MoreData").getProperty("master");
3031
Schema viaPath = model.getPath("/sampledatamanagement/v1/sampledata/custom/{id}").getGet().getResponse("200")
3132
.getContentMediaType("application/json").getSchema();
32-
assertTrue(direct == viaMoreData);
33-
assertTrue(direct == viaPath);
33+
assertSame(direct, viaMoreData);
34+
assertSame(direct, viaPath);
3435
}
3536
}

‎src/test/java/com/networknt/oas/LinksTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
import com.google.common.io.Resources;
1414
import com.networknt.oas.model.OpenApi3;
15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616

17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertNotNull;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertNotNull;
1919

2020
public class LinksTest {
2121

‎src/test/java/com/networknt/oas/OverlayAdapterTests.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,33 @@
1919
import com.networknt.jsonoverlay.Overlay;
2020
import com.networknt.oas.model.*;
2121
import com.networknt.oas.model.impl.PathImpl;
22-
import org.junit.Assert;
23-
import org.junit.Before;
24-
import org.junit.Test;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
2524

25+
import static org.junit.jupiter.api.Assertions.*;
2626

27-
public class OverlayAdapterTests extends Assert {
27+
28+
public class OverlayAdapterTests {
2829

2930
private OpenApi3 model;
3031

31-
@Before
32+
@BeforeEach
3233
public void setup() throws Exception {
3334
this.model = parseLocalModel("linksTest");
3435
}
3536

3637
@Test
3738
public void testPropertiesAdapter() {
38-
assertTrue(model == Overlay.of(model).get());
39-
assertTrue(model.getInfo() == new Overlay<Info>(model.getInfo()).get());
39+
assertSame(model, Overlay.of(model).get());
40+
assertSame(model.getInfo(), new Overlay<Info>(model.getInfo()).get());
4041
}
4142

4243
@Test
4344
public void testFieldAdapter() {
4445
assertEquals(model.getOpenApi(), Overlay.of(model, "openApi", String.class).get());
4546
@SuppressWarnings("unchecked")
4647
Map<String, PathImpl> pathsMapOverlay = Overlay.of(model, "paths", Map.class).get();
47-
assertTrue(model.getPath("/2.0/users/{username}") == pathsMapOverlay.get("/2.0/users/{username}"));
48+
assertSame(model.getPath("/2.0/users/{username}"), pathsMapOverlay.get("/2.0/users/{username}"));
4849
}
4950

5051
@Test
@@ -55,7 +56,7 @@ public void testMapAdapter() {
5556
MapOverlay<Path> castMapOverlay = Overlay.getMapOverlay(mapOverlay);
5657
assertTrue(castMapOverlay instanceof MapOverlay);
5758
Path path = Overlay.of(castMapOverlay, "/2.0/users/{username}").get();
58-
assertTrue(model.getPath("/2.0/users/{username}") == path);
59+
assertSame(model.getPath("/2.0/users/{username}"), path);
5960
}
6061

6162
@Test
@@ -67,7 +68,7 @@ public void testListAdapter() {
6768
ListOverlay<Parameter> castListOverlay = Overlay.getListOverlay(listOverlay);
6869
assertTrue(castListOverlay instanceof ListOverlay);
6970
Parameter param = Overlay.of(castListOverlay, 1).get();
70-
assertTrue(method.getParameter(1) == param);
71+
assertSame(method.getParameter(1), param);
7172
}
7273

7374
@Test

‎src/test/java/com/networknt/oas/PathsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
import com.google.common.io.Resources;
1414
import com.networknt.oas.model.OpenApi3;
15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616

17-
import static org.junit.Assert.*;
17+
import static org.junit.jupiter.api.Assertions.*;
1818

1919
public class PathsTest {
2020

0 commit comments

Comments
 (0)