dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate Dapr constants from IT container constants (#1315) 

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
Co-authored-by: Artur Ciocanu <ciocanu@adobe.com>
This commit is contained in:
artur-ciocanu 2025-04-22 21:09:48 +03:00 committed by GitHub
parent 8b8684a2db
commit 67c5991697
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java
View File

@ -58,7 +58,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
import static io.dapr.it.resiliency.SdkResiliencyIT.WIREMOCK_PORT;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.TOXI_PROXY_IMAGE_TAG;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@ -84,7 +85,7 @@ public class SdkResiliencyIT {
.withNetwork(NETWORK);
@Container
private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0")
private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer(TOXI_PROXY_IMAGE_TAG)
.withNetwork(NETWORK);
private static Proxy proxy;

2
sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java
View File

@ -35,7 +35,7 @@ import java.util.Map;
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

2
sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java
View File

@ -44,7 +44,7 @@ import java.util.Optional;
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

2
sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java
View File

@ -40,7 +40,7 @@ import java.util.Optional;
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;

2
sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java
View File

@ -37,7 +37,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.Collections;
import java.util.List;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(

10
sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.java Normal file
View File

@ -0,0 +1,10 @@
package io.dapr.it.testcontainers;
import io.dapr.testcontainers.DaprContainerConstants;
public interface ContainerConstants {
String DAPR_RUNTIME_IMAGE_TAG = DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
String DAPR_PLACEMENT_IMAGE_TAG = DaprContainerConstants.DAPR_PLACEMENT_IMAGE_TAG;
String DAPR_SCHEDULER_IMAGE_TAG = DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG;
String TOXI_PROXY_IMAGE_TAG = "ghcr.io/shopify/toxiproxy:2.5.0";
}

2
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java
View File

@ -37,7 +37,7 @@ import java.util.Map;
import java.util.Random;
import java.util.UUID;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
@SpringBootTest(

8
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.java
View File

@ -1,8 +0,0 @@
package io.dapr.it.testcontainers;
public interface DaprContainerConstants {
String DAPR_RUNTIME_VERSION = "1.15.4";
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_RUNTIME_VERSION;
String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_RUNTIME_VERSION;
String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_RUNTIME_VERSION;
}

2
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java
View File

@ -47,7 +47,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.fail;

3
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java
View File

@ -39,6 +39,7 @@ import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Random;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.junit.Assert.assertEquals;
@SpringBootTest(
@ -57,7 +58,7 @@ public class DaprJobsIT {
private static final int PORT = RANDOM.nextInt(1000) + 8000;
@Container
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG)
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
.withAppName("jobs-dapr-app")
.withNetwork(DAPR_NETWORK)
.withDaprLogLevel(DaprLogLevel.DEBUG)

3
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java
View File

@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Testcontainers
@ -27,7 +28,7 @@ public class DaprPlacementContainerIT {
@Container
private static final DaprPlacementContainer PLACEMENT_CONTAINER =
new DaprPlacementContainer(DaprContainerConstants.DAPR_PLACEMENT_IMAGE_TAG);
new DaprPlacementContainer(DAPR_PLACEMENT_IMAGE_TAG);
@Test
public void testDaprPlacementContainerDefaults() {

3
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java
View File

@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_SCHEDULER_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Testcontainers
@ -27,7 +28,7 @@ public class DaprSchedulerContainerIT {
@Container
private static final DaprSchedulerContainer SCHEDULER_CONTAINER =
new DaprSchedulerContainer(DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG);
new DaprSchedulerContainer(DAPR_SCHEDULER_IMAGE_TAG);
@Test
public void testDaprSchedulerContainerDefaults() {

2
sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java
View File

@ -39,7 +39,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Map;
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

2
testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java
View File

@ -2,7 +2,7 @@ package io.dapr.testcontainers;
public interface DaprContainerConstants {
String DAPR_VERSION = "1.15.4";
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION;
String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION;
String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION;
}