Skip to content

Commit fe742a1

Browse files
quen2404quen2404
committed
test: use junit 5
1 parent d869b29 commit fe742a1

16 files changed

+119
-79
lines changed

‎pom.xml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
5757
<junit.jupiter.version>5.1.0</junit.jupiter.version>
5858
<junit.platform.version>1.1.0</junit.platform.version>
59+
<assertj-core.version>3.10.0</assertj-core.version>
5960
</properties>
6061

6162
<dependencies>
@@ -70,9 +71,33 @@
7071
<version>1.2.0</version>
7172
</dependency>
7273
<dependency>
73-
<groupId>junit</groupId>
74-
<artifactId>junit</artifactId>
75-
<version>4.8.2</version>
74+
<groupId>org.junit.jupiter</groupId>
75+
<artifactId>junit-jupiter-engine</artifactId>
76+
<version>${junit.jupiter.version}</version>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.junit.jupiter</groupId>
81+
<artifactId>junit-jupiter-api</artifactId>
82+
<version>${junit.jupiter.version}</version>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.junit.platform</groupId>
87+
<artifactId>junit-platform-runner</artifactId>
88+
<version>${junit.platform.version}</version>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.junit.platform</groupId>
93+
<artifactId>junit-platform-launcher</artifactId>
94+
<version>${junit.platform.version}</version>
95+
<scope>test</scope>
96+
</dependency>
97+
<dependency>
98+
<groupId>org.assertj</groupId>
99+
<artifactId>assertj-core</artifactId>
100+
<version>${assertj-core.version}</version>
76101
<scope>test</scope>
77102
</dependency>
78103
<dependency>
@@ -235,6 +260,7 @@
235260
<include>**/*Tests.java</include>
236261
<include>**/*TestCase.java</include>
237262
</includes>
263+
<useSystemClassLoader>false</useSystemClassLoader>
238264
</configuration>
239265
<dependencies>
240266
<dependency>

‎src/test/java/com/qdesrame/openapi/test/AddPropDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
/** Created by adarsh.sharma on 26/02/18. */
99
public class AddPropDiffTest {

‎src/test/java/com/qdesrame/openapi/test/AllOfDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
/** Created by adarsh.sharma on 19/12/17. */
99
public class AllOfDiffTest {

‎src/test/java/com/qdesrame/openapi/test/ArrayDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
public class ArrayDiffTest {
99

‎src/test/java/com/qdesrame/openapi/test/BackwardCompatibilityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardCompatible;
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
/** Created by adarsh.sharma on 24/12/17. */
99
public class BackwardCompatibilityTest {

‎src/test/java/com/qdesrame/openapi/test/ContentDiffTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.qdesrame.openapi.test;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
35
import com.qdesrame.openapi.diff.OpenApiCompare;
46
import com.qdesrame.openapi.diff.model.ChangedOpenApi;
5-
import org.junit.Assert;
6-
import org.junit.Test;
7+
import org.junit.jupiter.api.Test;
78

89
public class ContentDiffTest {
910

@@ -13,18 +14,18 @@ public class ContentDiffTest {
1314
@Test
1415
public void testContentDiffWithOneEmptyMediaType() {
1516
ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC1, OPENAPI_DOC2);
16-
Assert.assertTrue(changedOpenApi.isIncompatible());
17+
assertThat(changedOpenApi.isIncompatible()).isTrue();
1718
}
1819

1920
@Test
2021
public void testContentDiffWithEmptyMediaTypes() {
2122
ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC1, OPENAPI_DOC1);
22-
Assert.assertTrue(changedOpenApi.isUnchanged());
23+
assertThat(changedOpenApi.isUnchanged()).isTrue();
2324
}
2425

2526
@Test
2627
public void testSameContentDiff() {
2728
ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC2, OPENAPI_DOC2);
28-
Assert.assertTrue(changedOpenApi.isUnchanged());
29+
assertThat(changedOpenApi.isUnchanged()).isTrue();
2930
}
3031
}

‎src/test/java/com/qdesrame/openapi/test/OneOfDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
55
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
66

7-
import org.junit.Test;
7+
import org.junit.jupiter.api.Test;
88

99
/** Created by adarsh.sharma on 19/12/17. */
1010
public class OneOfDiffTest {

‎src/test/java/com/qdesrame/openapi/test/OpenApiDiffTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.qdesrame.openapi.test;
22

33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
4+
import static org.assertj.core.api.Assertions.assertThat;
45

56
import com.qdesrame.openapi.diff.OpenApiCompare;
67
import com.qdesrame.openapi.diff.model.ChangedOpenApi;
@@ -11,15 +12,14 @@
1112
import java.io.FileWriter;
1213
import java.io.IOException;
1314
import java.util.List;
14-
import org.junit.Assert;
15-
import org.junit.Test;
15+
import org.junit.jupiter.api.Test;
1616

1717
public class OpenApiDiffTest {
1818

19+
final String SWAGGER_V2_HTTP = "http://petstore.swagger.io/v2/swagger.json";
1920
private final String OPENAPI_DOC1 = "petstore_v2_1.yaml";
2021
private final String OPENAPI_DOC2 = "petstore_v2_2.yaml";
2122
private final String OPENAPI_EMPTY_DOC = "petstore_v2_empty.yaml";
22-
final String SWAGGER_V2_HTTP = "http://petstore.swagger.io/v2/swagger.json";
2323

2424
@Test
2525
public void testEqual() {
@@ -44,9 +44,9 @@ public void testNewApi() {
4444
} catch (IOException e) {
4545
e.printStackTrace();
4646
}
47-
Assert.assertTrue(newEndpoints.size() > 0);
48-
Assert.assertTrue(missingEndpoints.isEmpty());
49-
Assert.assertTrue(changedEndPoints.isEmpty());
47+
assertThat(newEndpoints).isNotEmpty();
48+
assertThat(missingEndpoints).isEmpty();
49+
assertThat(changedEndPoints).isEmpty();
5050
}
5151

5252
@Test
@@ -67,9 +67,9 @@ public void testDeprecatedApi() {
6767
} catch (IOException e) {
6868
e.printStackTrace();
6969
}
70-
Assert.assertTrue(newEndpoints.isEmpty());
71-
Assert.assertTrue(missingEndpoints.size() > 0);
72-
Assert.assertTrue(changedEndPoints.isEmpty());
70+
assertThat(newEndpoints).isEmpty();
71+
assertThat(missingEndpoints).isNotEmpty();
72+
assertThat(changedEndPoints).isEmpty();
7373
}
7474

7575
@Test
@@ -87,7 +87,7 @@ public void testDiff() {
8787
} catch (IOException e) {
8888
e.printStackTrace();
8989
}
90-
Assert.assertFalse(changedEndPoints.isEmpty());
90+
assertThat(changedEndPoints).isNotEmpty();
9191
}
9292

9393
@Test

‎src/test/java/com/qdesrame/openapi/test/ParameterDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
44

5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
/** Created by adarsh.sharma on 03/01/18. */
88
public class ParameterDiffTest {

‎src/test/java/com/qdesrame/openapi/test/PathDiffTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.qdesrame.openapi.test;
22

33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
45

5-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
67

78
public class PathDiffTest {
89

@@ -15,8 +16,9 @@ public void testEqual() {
1516
assertOpenApiAreEquals(OPENAPI_PATH1, OPENAPI_PATH2);
1617
}
1718

18-
@Test(expected = IllegalArgumentException.class)
19+
@Test
1920
public void testMultiplePathWithSameSignature() {
20-
assertOpenApiAreEquals(OPENAPI_PATH3, OPENAPI_PATH3);
21+
assertThrows(
22+
IllegalArgumentException.class, () -> assertOpenApiAreEquals(OPENAPI_PATH3, OPENAPI_PATH3));
2123
}
2224
}

‎src/test/java/com/qdesrame/openapi/test/RecursiveSchemaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
44
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
55

6-
import org.junit.Test;
6+
import org.junit.jupiter.api.Test;
77

88
/** Created by adarsh.sharma on 13/02/18. */
99
public class RecursiveSchemaTest {

‎src/test/java/com/qdesrame/openapi/test/ReferenceDiffCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
44

5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
/** Created by adarsh.sharma on 25/12/17. */
88
public class ReferenceDiffCacheTest {

‎src/test/java/com/qdesrame/openapi/test/RequestDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
44

5-
import org.junit.Test;
5+
import org.junit.jupiter.api.Test;
66

77
/** Created by adarsh.sharma on 03/01/18. */
88
public class RequestDiffTest {

‎src/test/java/com/qdesrame/openapi/test/ResponseHeaderDiffTest.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.qdesrame.openapi.test;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
35
import com.qdesrame.openapi.diff.OpenApiCompare;
46
import com.qdesrame.openapi.diff.model.ChangedHeaders;
57
import com.qdesrame.openapi.diff.model.ChangedOpenApi;
68
import com.qdesrame.openapi.diff.model.ChangedResponse;
79
import java.util.Map;
8-
import org.junit.Assert;
9-
import org.junit.Test;
10+
import org.junit.jupiter.api.Test;
1011

1112
/** Created by adarsh.sharma on 28/12/17. */
1213
public class ResponseHeaderDiffTest {
@@ -18,18 +19,18 @@ public class ResponseHeaderDiffTest {
1819
public void testDiffDifferent() {
1920
ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC1, OPENAPI_DOC2);
2021

21-
Assert.assertTrue(changedOpenApi.getNewEndpoints().isEmpty());
22-
Assert.assertTrue(changedOpenApi.getMissingEndpoints().isEmpty());
23-
Assert.assertTrue(changedOpenApi.getChangedOperations().size() > 0);
22+
assertThat(changedOpenApi.getNewEndpoints()).isEmpty();
23+
assertThat(changedOpenApi.getMissingEndpoints()).isEmpty();
24+
assertThat(changedOpenApi.getChangedOperations()).isNotEmpty();
2425

2526
Map<String, ChangedResponse> changedResponses =
2627
changedOpenApi.getChangedOperations().get(0).getApiResponses().getChanged();
27-
Assert.assertTrue(changedResponses.size() > 0);
28-
Assert.assertTrue(changedResponses.containsKey("200"));
28+
assertThat(changedResponses).isNotEmpty();
29+
assertThat(changedResponses).containsKey("200");
2930
ChangedHeaders changedHeaders = changedResponses.get("200").getHeaders();
30-
Assert.assertTrue(changedHeaders.isDifferent());
31-
Assert.assertTrue(changedHeaders.getChanged().size() == 1);
32-
Assert.assertTrue(changedHeaders.getIncreased().size() == 1);
33-
Assert.assertTrue(changedHeaders.getMissing().size() == 1);
31+
assertThat(changedHeaders.isDifferent()).isTrue();
32+
assertThat(changedHeaders.getChanged()).hasSize(1);
33+
assertThat(changedHeaders.getIncreased()).hasSize(1);
34+
assertThat(changedHeaders.getMissing()).hasSize(1);
3435
}
3536
}

0 commit comments

Comments
 (0)