Skip to content

Commit 8cf3be4

Browse files
jenschudejenschude
authored
Merge pull request #889 from commercetools/remove-dataprovider-lib
remove dataprovider library
2 parents c00d011 + 137b8a9 commit 8cf3be4

File tree

10 files changed

+40
-101
lines changed

10 files changed

+40
-101
lines changed

‎commercetools/commercetools-monitoring-datadog/src/test/java/example/TelemetryMiddlewareTest.java‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,23 @@
1212
import com.commercetools.monitoring.datadog.DatadogMiddleware;
1313
import com.datadog.api.client.ApiException;
1414
import com.datadog.api.client.v2.api.MetricsApi;
15-
import com.tngtech.junit.dataprovider.DataProvider;
16-
import com.tngtech.junit.dataprovider.DataProviderExtension;
17-
import com.tngtech.junit.dataprovider.UseDataProvider;
18-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
1915

2016
import io.vrap.rmf.base.client.*;
2117

2218
import org.assertj.core.api.Assertions;
23-
import org.junit.jupiter.api.TestTemplate;
24-
import org.junit.jupiter.api.extension.ExtendWith;
19+
import org.junit.jupiter.params.ParameterizedTest;
20+
import org.junit.jupiter.params.provider.MethodSource;
2521
import org.mockito.Mockito;
2622

27-
@ExtendWith(DataProviderExtension.class)
28-
@ExtendWith(UseDataProviderExtension.class)
2923
public class TelemetryMiddlewareTest {
3024

31-
@DataProvider
3225
public static Object[][] responses() {
3326
return new Object[][] { { 200, 2 }, { 201, 2 }, { 400, 3 }, { 401, 3 }, { 403, 3 }, { 404, 3 }, { 409, 3 },
3427
{ 499, 3 }, { 500, 3 }, { 502, 3 }, { 503, 3 }, { 504, 3 }, { 599, 3 }, };
3528
}
3629

37-
@TestTemplate
38-
@UseDataProvider("responses")
30+
@ParameterizedTest
31+
@MethodSource("responses")
3932
public void testCounts(int statusCode, int count) throws ApiException {
4033
MetricsApi metricsApi = Mockito.mock(MetricsApi.class);
4134
Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null);
@@ -59,8 +52,8 @@ public void testCounts(int statusCode, int count) throws ApiException {
5952
}));
6053
}
6154

62-
@TestTemplate
63-
@UseDataProvider("responses")
55+
@ParameterizedTest
56+
@MethodSource("responses")
6457
public void testHttpCounts(int statusCode, int count) throws URISyntaxException, ApiException {
6558
MetricsApi metricsApi = Mockito.mock(MetricsApi.class);
6659
Mockito.when(metricsApi.submitMetrics(Mockito.any())).thenReturn(null);

‎commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/ErrorTest.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
import com.commercetools.api.models.error.ErrorObject;
1515
import com.commercetools.api.models.error.ErrorResponse;
1616
import com.commercetools.api.models.error.InvalidJsonInputError;
17-
import com.tngtech.junit.dataprovider.DataProvider;
18-
import com.tngtech.junit.dataprovider.DataProviderExtension;
19-
import com.tngtech.junit.dataprovider.UseDataProvider;
20-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
2117

2218
import io.vrap.rmf.base.client.*;
2319
import io.vrap.rmf.base.client.error.*;
@@ -26,13 +22,10 @@
2622

2723
import org.assertj.core.api.Assertions;
2824
import org.junit.jupiter.api.Test;
29-
import org.junit.jupiter.api.TestTemplate;
30-
import org.junit.jupiter.api.extension.ExtendWith;
25+
import org.junit.jupiter.params.ParameterizedTest;
26+
import org.junit.jupiter.params.provider.MethodSource;
3127

32-
@ExtendWith(DataProviderExtension.class)
33-
@ExtendWith(UseDataProviderExtension.class)
3428
public class ErrorTest {
35-
@DataProvider
3629
public static Object[][] exceptions() {
3730
return new Object[][] { { 400, BadRequestException.class }, { 401, UnauthorizedException.class },
3831
{ 403, ForbiddenException.class }, { 404, NotFoundException.class },
@@ -53,8 +46,8 @@ public void deprecatedAttributesAccessor() throws IOException {
5346
assertThat(error.getDetailedErrorMessage()).isEqualTo("actions -> name: Missing required value");
5447
}
5548

56-
@TestTemplate
57-
@UseDataProvider("exceptions")
49+
@ParameterizedTest
50+
@MethodSource("exceptions")
5851
public void testErrorInvalidResponse(int statusCode, Class<ApiHttpException> exceptionClass) {
5952
ErrorMiddleware middleware = ErrorMiddleware.of(ApiHttpExceptionFactory.of(ResponseSerializer.of()));
6053

‎commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/OrderQueryBuilderTest.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,25 @@
66
import com.commercetools.api.models.order.OrderSearchRequestBuilder;
77
import com.commercetools.api.models.order.OrderSearchSortOrder;
88
import com.fasterxml.jackson.core.JsonProcessingException;
9-
import com.tngtech.junit.dataprovider.DataProvider;
10-
import com.tngtech.junit.dataprovider.DataProviderExtension;
11-
import com.tngtech.junit.dataprovider.UseDataProvider;
12-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
139

1410
import io.vrap.rmf.base.client.utils.json.JsonUtils;
1511

1612
import org.assertj.core.api.Assertions;
1713
import org.json.JSONException;
18-
import org.junit.jupiter.api.TestTemplate;
19-
import org.junit.jupiter.api.extension.ExtendWith;
14+
import org.junit.jupiter.params.ParameterizedTest;
15+
import org.junit.jupiter.params.provider.MethodSource;
2016
import org.skyscreamer.jsonassert.JSONAssert;
2117

22-
@ExtendWith(UseDataProviderExtension.class)
23-
@ExtendWith(DataProviderExtension.class)
2418
public class OrderQueryBuilderTest {
25-
@TestTemplate
26-
@UseDataProvider("searchBuilder")
19+
@ParameterizedTest
20+
@MethodSource("searchBuilder")
2721
public void buildUnchecked(OrderSearchRequestBuilder builder, String expectedQuery)
2822
throws JSONException, JsonProcessingException {
2923
OrderSearchRequest request = builder.buildUnchecked();
3024
Assertions.assertThat(request).isInstanceOf(OrderSearchRequest.class);
3125
JSONAssert.assertEquals(expectedQuery, JsonUtils.toJsonString(request), true);
3226
}
3327

34-
@DataProvider
3528
public static Object[][] searchBuilder() {
3629
return new Object[][] { new Object[] { OrderSearchRequest.builder()
3730
.withQuery(q -> q.and(b -> b

‎commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/PagedQueryRequestTest.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,26 @@
44
import java.util.Collections;
55

66
import com.commercetools.api.client.*;
7-
import com.tngtech.junit.dataprovider.DataProvider;
8-
import com.tngtech.junit.dataprovider.DataProviderExtension;
9-
import com.tngtech.junit.dataprovider.UseDataProvider;
10-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
117

128
import io.vrap.rmf.base.client.*;
139

1410
import org.apache.commons.lang3.tuple.Pair;
1511
import org.assertj.core.api.Assertions;
1612
import org.assertj.core.util.Lists;
17-
import org.junit.jupiter.api.TestTemplate;
18-
import org.junit.jupiter.api.extension.ExtendWith;
13+
import org.junit.jupiter.params.ParameterizedTest;
14+
import org.junit.jupiter.params.provider.MethodSource;
1915

20-
@ExtendWith(UseDataProviderExtension.class)
21-
@ExtendWith(DataProviderExtension.class)
2216
public class PagedQueryRequestTest {
2317

2418
private final static ApiRoot apiRoot = ApiRoot.of();
2519

26-
@TestTemplate
27-
@UseDataProvider("requestWithMethodParameters")
20+
@ParameterizedTest
21+
@MethodSource("requestWithMethodParameters")
2822
public void defaultMethods(ApiHttpRequest request, String httpMethod, String uri) {
2923
Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
3024
Assertions.assertThat(request.getUri().toString()).isEqualTo(uri);
3125
}
3226

33-
@DataProvider
3427
public static Object[][] requestWithMethodParameters() {
3528
return new Object[][] {
3629
new Object[] { apiRoot.withProjectKey("test_projectKey")

‎commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/api/predicates/query/QueryTests.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,19 @@
2020
import com.commercetools.api.predicates.query.state.StateQueryBuilderDsl;
2121
import com.commercetools.api.predicates.query.tax_category.TaxRateQueryBuilderDsl;
2222
import com.commercetools.api.predicates.query.type.TypeQueryBuilderDsl;
23-
import com.tngtech.junit.dataprovider.DataProvider;
24-
import com.tngtech.junit.dataprovider.DataProviderExtension;
25-
import com.tngtech.junit.dataprovider.UseDataProvider;
26-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
2723

2824
import org.assertj.core.api.Assertions;
29-
import org.junit.jupiter.api.TestTemplate;
30-
import org.junit.jupiter.api.extension.ExtendWith;
25+
import org.junit.jupiter.params.ParameterizedTest;
26+
import org.junit.jupiter.params.provider.MethodSource;
3127

32-
@ExtendWith(UseDataProviderExtension.class)
33-
@ExtendWith(DataProviderExtension.class)
3428
public class QueryTests {
3529

36-
@TestTemplate
37-
@UseDataProvider("predicates")
30+
@ParameterizedTest
31+
@MethodSource("predicates")
3832
public void predicateRender(QueryPredicate t, String expectedPredicate) {
3933
Assertions.assertThat(t.render()).isEqualTo(expectedPredicate);
4034
}
4135

42-
@DataProvider
4336
public static Object[][] predicates() {
4437
return new Object[][] { new Object[] { CartQueryBuilderDsl.of().id().is("abc"), "id = \"abc\"", },
4538
new Object[] { CartQueryBuilderDsl.of().id().is("abc").not(), "not(id = \"abc\")", },

‎commercetools/commercetools-sdk-java-api/src/test/java/com/commercetools/api/search/SearchTests.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,12 @@
1212
import com.commercetools.api.models.Identifiable;
1313
import com.commercetools.api.models.common.DefaultCurrencyUnits;
1414
import com.commercetools.api.search.products.*;
15-
import com.tngtech.junit.dataprovider.DataProvider;
16-
import com.tngtech.junit.dataprovider.DataProviderExtension;
17-
import com.tngtech.junit.dataprovider.UseDataProvider;
18-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
1915

2016
import org.assertj.core.api.Assertions;
2117
import org.junit.jupiter.api.Test;
22-
import org.junit.jupiter.api.TestTemplate;
23-
import org.junit.jupiter.api.extension.ExtendWith;
18+
import org.junit.jupiter.params.ParameterizedTest;
19+
import org.junit.jupiter.params.provider.MethodSource;
2420

25-
@ExtendWith(UseDataProviderExtension.class)
26-
@ExtendWith(DataProviderExtension.class)
2721
public class SearchTests {
2822

2923
@Test
@@ -58,19 +52,18 @@ public void postRequest() {
5852
"filter=categories.id%3A+%22abc%22&filter.facets=categories.id%3A+%22def%22&filter.query=categories.id%3A+%22ghi%22&facet=categories.id");
5953
}
6054

61-
@TestTemplate
62-
@UseDataProvider("filterExpressions")
55+
@ParameterizedTest
56+
@MethodSource("filterExpressions")
6357
public void filterRender(FilterExpression searchExpression, String expectedPredicate) {
6458
Assertions.assertThat(searchExpression.render()).isEqualTo(expectedPredicate);
6559
}
6660

67-
@TestTemplate
68-
@UseDataProvider("facetExpressions")
61+
@ParameterizedTest
62+
@MethodSource("facetExpressions")
6963
public void facetRender(FilterExpression searchExpression, String expectedPredicate) {
7064
Assertions.assertThat(searchExpression.render()).isEqualTo(expectedPredicate);
7165
}
7266

73-
@DataProvider
7467
public static Object[][] filterExpressions() {
7568
return new Object[][] { new Object[] { ProductFilterExpressionBuilder.of().key().is("foo"), "key: \"foo\"" },
7669
new Object[] { ProductFilterExpressionBuilder.of().key().exists(), "key: exists" },
@@ -291,7 +284,6 @@ public static Object[][] filterExpressions() {
291284
};
292285
}
293286

294-
@DataProvider
295287
public static Object[][] facetExpressions() {
296288
return new Object[][] {
297289
new Object[] { ProductFacetExpressionBuilder.of().categories().id().alias("cat"),

‎gradle-scripts/extensions.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ ext {
5252

5353
junit = [
5454
junit: 'org.junit.jupiter:junit-jupiter:5.11.4',
55-
dataprovider: 'com.tngtech.junit.dataprovider:junit-jupiter-dataprovider:2.10',
5655
jsonassert: 'org.skyscreamer:jsonassert:1.5.3',
5756
assertj: 'org.assertj:assertj-core:3.27.3'
5857
]

‎gradle-scripts/subproject-dependencies.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dependencies {
22
testImplementation junit.junit
3-
testImplementation junit.dataprovider
43
testImplementation junit.assertj
54
testImplementation awaitility.awaitility
65
testImplementation logback.classic

‎rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/http/ErrorMiddlewareTest.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,15 @@
77
import java.time.Duration;
88
import java.util.concurrent.CompletableFuture;
99

10-
import com.tngtech.junit.dataprovider.DataProvider;
11-
import com.tngtech.junit.dataprovider.DataProviderExtension;
12-
import com.tngtech.junit.dataprovider.UseDataProvider;
13-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
14-
1510
import io.vrap.rmf.base.client.*;
1611
import io.vrap.rmf.base.client.error.*;
1712

1813
import org.assertj.core.api.Assertions;
19-
import org.junit.jupiter.api.TestTemplate;
20-
import org.junit.jupiter.api.extension.ExtendWith;
14+
import org.junit.jupiter.params.ParameterizedTest;
15+
import org.junit.jupiter.params.provider.MethodSource;
2116

22-
@ExtendWith(DataProviderExtension.class)
23-
@ExtendWith(UseDataProviderExtension.class)
2417
public class ErrorMiddlewareTest {
2518

26-
@DataProvider
2719
public static Object[][] exceptions() {
2820
return new Object[][] { { 400, BadRequestException.class }, { 401, UnauthorizedException.class },
2921
{ 403, ForbiddenException.class }, { 404, NotFoundException.class },
@@ -33,8 +25,8 @@ public static Object[][] exceptions() {
3325
{ 599, ApiServerException.class }, };
3426
}
3527

36-
@TestTemplate
37-
@UseDataProvider("exceptions")
28+
@ParameterizedTest
29+
@MethodSource("exceptions")
3830
public void testError(int statusCode, Class<ApiHttpException> exceptionClass) {
3931
ErrorMiddleware middleware = ErrorMiddleware.of(HttpExceptionFactory.of(ResponseSerializer.of()));
4032

@@ -50,8 +42,8 @@ public void testError(int statusCode, Class<ApiHttpException> exceptionClass) {
5042
}).matches(e -> e.getStatusCode() == statusCode);
5143
}
5244

53-
@TestTemplate
54-
@UseDataProvider("exceptions")
45+
@ParameterizedTest
46+
@MethodSource("exceptions")
5547
public void testErrorInvalidResponse(int statusCode, Class<ApiHttpException> exceptionClass) {
5648
ErrorMiddleware middleware = ErrorMiddleware.of(HttpExceptionFactory.of(ResponseSerializer.of()));
5749

‎rmf/rmf-java-base/src/test/java/io/vrap/rmf/base/client/http/TelemetryMiddlewareTest.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,23 @@
99
import java.util.concurrent.CompletableFuture;
1010
import java.util.function.Function;
1111

12-
import com.tngtech.junit.dataprovider.DataProvider;
13-
import com.tngtech.junit.dataprovider.DataProviderExtension;
14-
import com.tngtech.junit.dataprovider.UseDataProvider;
15-
import com.tngtech.junit.dataprovider.UseDataProviderExtension;
16-
1712
import io.vrap.rmf.base.client.*;
1813
import io.vrap.rmf.base.client.error.*;
1914

2015
import org.assertj.core.api.Assertions;
21-
import org.junit.jupiter.api.TestTemplate;
22-
import org.junit.jupiter.api.extension.ExtendWith;
16+
import org.junit.jupiter.params.ParameterizedTest;
17+
import org.junit.jupiter.params.provider.MethodSource;
2318

24-
@ExtendWith(DataProviderExtension.class)
25-
@ExtendWith(UseDataProviderExtension.class)
2619
public class TelemetryMiddlewareTest {
2720

28-
@DataProvider
2921
public static Object[][] responses() {
3022
return new Object[][] { { 200, 1, 0 }, { 201, 1, 0 }, { 400, 1, 1 }, { 401, 1, 1 }, { 403, 1, 1 },
3123
{ 404, 1, 1 }, { 409, 1, 1 }, { 499, 1, 1 }, { 500, 1, 1 }, { 502, 1, 1 }, { 503, 1, 1 }, { 504, 1, 1 },
3224
{ 599, 1, 1 }, };
3325
}
3426

35-
@TestTemplate
36-
@UseDataProvider("responses")
27+
@ParameterizedTest
28+
@MethodSource("responses")
3729
public void testCounts(int statusCode, int count, int errorCount) {
3830
TestTelemetryMiddleware middleware = new TestTelemetryMiddleware();
3931

@@ -50,8 +42,8 @@ public void testCounts(int statusCode, int count, int errorCount) {
5042
Assertions.assertThat(middleware.errorCount).isEqualTo(errorCount);
5143
}
5244

53-
@TestTemplate
54-
@UseDataProvider("responses")
45+
@ParameterizedTest
46+
@MethodSource("responses")
5547
public void testHttpCounts(int statusCode, int count, int errorCount) throws URISyntaxException {
5648
TestTelemetryMiddleware middleware = new TestTelemetryMiddleware();
5749

0 commit comments

Comments
 (0)