Skip to content

Commit 335e527

Browse files
paullatzelspergerpaullatzelsperger
committed
explicitly set default ports in tests
1 parent 1ea0b1c commit 335e527

File tree

16 files changed

+76
-15
lines changed

16 files changed

+76
-15
lines changed

‎extensions/api/data-management/asset/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/asset/AssetApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public class AssetApiControllerIntegrationTest {
5252
@BeforeEach
5353
void setUp(EdcExtension extension) {
5454
extension.setConfiguration(Map.of(
55+
"web.http.port", String.valueOf(getFreePort()),
56+
"web.http.path", "/api",
5557
"web.http.data.port", String.valueOf(port),
5658
"web.http.data.path", "/api/v1/data",
5759
"edc.api.auth.key", authKey

‎extensions/api/data-management/asset/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/asset/service/AssetEventDispatchTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@
2222
import org.eclipse.dataspaceconnector.spi.event.asset.AssetDeleted;
2323
import org.eclipse.dataspaceconnector.spi.types.domain.DataAddress;
2424
import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
25+
import org.junit.jupiter.api.BeforeEach;
2526
import org.junit.jupiter.api.Test;
2627
import org.junit.jupiter.api.extension.ExtendWith;
2728

29+
import java.util.Map;
2830
import java.util.concurrent.CountDownLatch;
2931

3032
import static java.util.concurrent.TimeUnit.SECONDS;
3133
import static org.assertj.core.api.Assertions.assertThat;
34+
import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
3235
import static org.mockito.ArgumentMatchers.isA;
3336
import static org.mockito.Mockito.doAnswer;
3437
import static org.mockito.Mockito.mock;
@@ -39,6 +42,14 @@ public class AssetEventDispatchTest {
3942

4043
private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
4144

45+
@BeforeEach
46+
void setUp(EdcExtension extension) {
47+
extension.setConfiguration(Map.of(
48+
"web.http.port", String.valueOf(getFreePort()),
49+
"web.http.path", "/api"
50+
));
51+
}
52+
4253
@Test
4354
void shouldDispatchEventsOnAssetCreationAndDeletion(AssetService service, EventRouter eventRouter) throws InterruptedException {
4455
var createdLatch = onDispatchLatch(AssetCreated.class);

‎extensions/api/data-management/catalog-api/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/catalog/CatalogApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ void setUp(EdcExtension extension) {
5959

6060
extension.registerSystemExtension(ServiceExtension.class, new TestExtension());
6161
extension.setConfiguration(Map.of(
62+
"web.http.port", String.valueOf(getFreePort()),
63+
"web.http.path", "/api",
6264
"web.http.data.port", String.valueOf(port),
6365
"web.http.data.path", "/api/v1/data",
6466
"edc.api.auth.key", authKey

‎extensions/api/data-management/contractagreement/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractagreement/ContractAgreementApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public class ContractAgreementApiControllerIntegrationTest {
4343
@BeforeEach
4444
void setUp(EdcExtension extension) {
4545
extension.setConfiguration(Map.of(
46+
"web.http.port", String.valueOf(getFreePort()),
47+
"web.http.path", "/api",
4648
"web.http.data.port", String.valueOf(port),
4749
"web.http.data.path", "/api/v1/data",
4850
"edc.api.auth.key", authKey

‎extensions/api/data-management/contractdefinition/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractdefinition/ContractDefinitionApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public class ContractDefinitionApiControllerIntegrationTest {
4545
@BeforeEach
4646
void setUp(EdcExtension extension) {
4747
extension.setConfiguration(Map.of(
48+
"web.http.port", String.valueOf(getFreePort()),
49+
"web.http.path", "/api",
4850
"web.http.data.port", String.valueOf(port),
4951
"web.http.data.path", "/api/v1/data",
5052
"edc.api.auth.key", authKey

‎extensions/api/data-management/contractdefinition/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractdefinition/service/ContractDefinitionEventDispatchTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
import org.eclipse.dataspaceconnector.spi.event.contractdefinition.ContractDefinitionCreated;
2222
import org.eclipse.dataspaceconnector.spi.event.contractdefinition.ContractDefinitionDeleted;
2323
import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractDefinition;
24+
import org.junit.jupiter.api.BeforeEach;
2425
import org.junit.jupiter.api.Test;
2526
import org.junit.jupiter.api.extension.ExtendWith;
2627

28+
import java.util.Map;
2729
import java.util.UUID;
2830

2931
import static org.awaitility.Awaitility.await;
32+
import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
3033
import static org.mockito.ArgumentMatchers.isA;
3134
import static org.mockito.Mockito.mock;
3235
import static org.mockito.Mockito.verify;
@@ -36,6 +39,14 @@ public class ContractDefinitionEventDispatchTest {
3639

3740
private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
3841

42+
@BeforeEach
43+
void setUp(EdcExtension extension) {
44+
extension.setConfiguration(Map.of(
45+
"web.http.port", String.valueOf(getFreePort()),
46+
"web.http.path", "/api"
47+
));
48+
}
49+
3950
@Test
4051
void shouldDispatchEventOnContractDefinitionCreationAndDeletion(ContractDefinitionService service, EventRouter eventRouter) {
4152
eventRouter.register(eventSubscriber);

‎extensions/api/data-management/contractnegotiation/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractnegotiation/ContractNegotiationApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ class ContractNegotiationApiControllerIntegrationTest {
5151
@BeforeEach
5252
void setUp(EdcExtension extension) {
5353
extension.setConfiguration(Map.of(
54+
"web.http.port", String.valueOf(getFreePort()),
55+
"web.http.path", "/api",
5456
"web.http.data.port", String.valueOf(port),
5557
"web.http.data.path", "/api/v1/data",
5658
"edc.api.auth.key", authKey

‎extensions/api/data-management/contractnegotiation/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/contractnegotiation/service/ContractNegotiationEventDispatchTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import java.util.concurrent.CompletableFuture;
5454

5555
import static org.awaitility.Awaitility.await;
56+
import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
5657
import static org.mockito.ArgumentMatchers.any;
5758
import static org.mockito.ArgumentMatchers.isA;
5859
import static org.mockito.Mockito.mock;
@@ -68,6 +69,8 @@ public class ContractNegotiationEventDispatchTest {
6869
@BeforeEach
6970
void setUp(EdcExtension extension) {
7071
extension.setConfiguration(Map.of(
72+
"web.http.port", String.valueOf(getFreePort()),
73+
"web.http.path", "/api",
7174
"edc.negotiation.consumer.send.retry.limit", "0",
7275
"edc.negotiation.provider.send.retry.limit", "0"
7376
));

‎extensions/api/data-management/policydefinition/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/policy/PolicyDefinitionApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public class PolicyDefinitionApiControllerIntegrationTest {
4343
@BeforeEach
4444
void setUp(EdcExtension extension) {
4545
extension.setConfiguration(Map.of(
46+
"web.http.port", String.valueOf(getFreePort()),
47+
"web.http.path", "/api",
4648
"web.http.data.port", String.valueOf(port),
4749
"web.http.data.path", "/api/v1/data",
4850
"edc.api.auth.key", authKey

‎extensions/api/data-management/policydefinition/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/policy/service/PolicyDefinitionEventDispatchTest.java

+11
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@
2222
import org.eclipse.dataspaceconnector.spi.event.EventSubscriber;
2323
import org.eclipse.dataspaceconnector.spi.event.policydefinition.PolicyDefinitionCreated;
2424
import org.eclipse.dataspaceconnector.spi.event.policydefinition.PolicyDefinitionDeleted;
25+
import org.junit.jupiter.api.BeforeEach;
2526
import org.junit.jupiter.api.Test;
2627
import org.junit.jupiter.api.extension.ExtendWith;
2728

29+
import java.util.Map;
2830
import java.util.concurrent.CountDownLatch;
2931

3032
import static java.util.concurrent.TimeUnit.SECONDS;
3133
import static org.assertj.core.api.Assertions.assertThat;
34+
import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
3235
import static org.mockito.ArgumentMatchers.isA;
3336
import static org.mockito.Mockito.doAnswer;
3437
import static org.mockito.Mockito.mock;
@@ -39,6 +42,14 @@ public class PolicyDefinitionEventDispatchTest {
3942

4043
private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
4144

45+
@BeforeEach
46+
void setUp(EdcExtension extension) {
47+
extension.setConfiguration(Map.of(
48+
"web.http.port", String.valueOf(getFreePort()),
49+
"web.http.path", "/api"
50+
));
51+
}
52+
4253
@Test
4354
void shouldDispatchEventOnPolicyDefinitionCreationAndDeletion(PolicyDefinitionService service, EventRouter eventRouter) throws InterruptedException {
4455
var createdLatch = onDispatchLatch(PolicyDefinitionCreated.class);

‎extensions/api/data-management/transferprocess/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/transferprocess/TransferProcessApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ class TransferProcessApiControllerIntegrationTest {
4747
@BeforeEach
4848
void setUp(EdcExtension extension) {
4949
extension.setConfiguration(Map.of(
50+
"web.http.port", String.valueOf(getFreePort()),
51+
"web.http.path", "/api",
5052
"web.http.data.port", String.valueOf(port),
5153
"web.http.data.path", "/api/v1/data",
5254
"edc.api.auth.key", authKey

‎extensions/api/data-management/transferprocess/src/test/java/org/eclipse/dataspaceconnector/api/datamanagement/transferprocess/service/TransferProcessEventDispatchTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.concurrent.Executors;
4141

4242
import static org.awaitility.Awaitility.await;
43+
import static org.eclipse.dataspaceconnector.junit.testfixtures.TestUtils.getFreePort;
4344
import static org.mockito.ArgumentMatchers.any;
4445
import static org.mockito.ArgumentMatchers.isA;
4546
import static org.mockito.Mockito.mock;
@@ -54,10 +55,12 @@ public class TransferProcessEventDispatchTest {
5455
@BeforeEach
5556
void setUp(EdcExtension extension) {
5657
extension.setConfiguration(Map.of("edc.transfer.send.retry.limit", "0",
57-
"edc.transfer.send.retry.base-delay.ms", "0"));
58+
"edc.transfer.send.retry.base-delay.ms", "0",
59+
"web.http.port", String.valueOf(getFreePort()),
60+
"web.http.path", "/api"));
5861
extension.registerServiceMock(TransferWaitStrategy.class, () -> 1);
5962
extension.registerServiceMock(EventExecutorServiceContainer.class,
60-
new EventExecutorServiceContainer(Executors.newSingleThreadExecutor()));
63+
new EventExecutorServiceContainer(Executors.newSingleThreadExecutor()));
6164
}
6265

6366
@Test

‎extensions/http-provisioner/src/test/java/org/eclipse/dataspaceconnector/transfer/provision/http/impl/HttpProvisionerExtensionEndToEndTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ void processProviderRequestRetry(TransferProcessManager processManager,
101101
@BeforeEach
102102
void setup(EdcExtension extension) {
103103
extension.setConfiguration(Map.of(
104+
"web.http.port", String.valueOf(getFreePort()),
105+
"web.http.path", "/api",
104106
"web.http.data.port", String.valueOf(dataPort),
105107
"web.http.data.path", "/api/v1/data"
106108
));

‎extensions/http-provisioner/src/test/java/org/eclipse/dataspaceconnector/transfer/provision/http/webhook/HttpProvisionerWebhookApiControllerIntegrationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ class HttpProvisionerWebhookApiControllerIntegrationTest {
4949
@BeforeEach
5050
void setUp(EdcExtension extension) {
5151
extension.setConfiguration(Map.of(
52+
"web.http.port", String.valueOf(getFreePort()),
53+
"web.http.path", "/api",
5254
"web.http.provisioner.port", String.valueOf(port),
5355
"web.http.provisioner.path", PROVISIONER_BASE_PATH,
5456
"edc.api.auth.key", authKey

‎extensions/http/jersey/src/test/java/org/eclipse/dataspaceconnector/extension/jersey/mapper/ExceptionMappersIntegrationTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class ExceptionMappersIntegrationTest {
5656
void setUp(EdcExtension extension) {
5757
extension.setConfiguration(Map.of(
5858
"web.http.port", String.valueOf(getFreePort()),
59+
"web.http.path", "/api",
5960
"web.http.test.port", String.valueOf(port),
6061
"web.http.test.path", "/"
6162
));
@@ -103,6 +104,16 @@ void shouldListJakartaValidationMessageInResponseBody() {
103104
));
104105
}
105106

107+
private static class RequestPayload {
108+
@NotBlank
109+
@JsonProperty
110+
private String data;
111+
112+
@Positive
113+
@JsonProperty
114+
private long number;
115+
}
116+
106117
@Path("/test")
107118
public class TestController {
108119

@@ -120,16 +131,6 @@ public void doAction(@Valid RequestPayload payload) {
120131

121132
}
122133

123-
private static class RequestPayload {
124-
@NotBlank
125-
@JsonProperty
126-
private String data;
127-
128-
@Positive
129-
@JsonProperty
130-
private long number;
131-
}
132-
133134
private class MyServiceExtension implements ServiceExtension {
134135
@Inject
135136
private WebService webService;

‎extensions/junit/src/main/java/org/eclipse/dataspaceconnector/junit/testfixtures/TestUtils.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
public class TestUtils {
3434
public static final int MAX_TCP_PORT = 65_535;
3535
public static final String GRADLE_WRAPPER;
36-
private static File buildRoot = null;
3736
private static final String GRADLE_WRAPPER_UNIX = "gradlew";
3837
private static final String GRADLE_WRAPPER_WINDOWS = "gradlew.bat";
38+
private static final Random RANDOM = new Random();
39+
private static File buildRoot = null;
3940

4041
static {
4142
GRADLE_WRAPPER = (System.getProperty("os.name").toLowerCase().contains("win")) ? GRADLE_WRAPPER_WINDOWS : GRADLE_WRAPPER_UNIX;
@@ -65,7 +66,7 @@ public static String getResourceFileContentAsString(String resourceName) {
6566
* @throws IllegalArgumentException if no free port is available
6667
*/
6768
public static int getFreePort() {
68-
var rnd = 1024 + new Random().nextInt(MAX_TCP_PORT - 1024);
69+
var rnd = 1024 + RANDOM.nextInt(MAX_TCP_PORT - 1024);
6970
return getFreePort(rnd);
7071
}
7172

@@ -152,7 +153,9 @@ public static OkHttpClient testOkHttpClient() {
152153
*/
153154
public static File findBuildRoot() {
154155
// Use cached value if already existing.
155-
if (buildRoot != null) return buildRoot;
156+
if (buildRoot != null) {
157+
return buildRoot;
158+
}
156159

157160
File canonicalFile;
158161
try {

0 commit comments

Comments
 (0)