Simplify the testing a little bit

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
This commit is contained in:
Artur Ciocanu 2025-04-24 09:11:47 -07:00
parent 404e0b9eb4
commit 87fbc7bb4c
4 changed files with 9 additions and 54 deletions

View File

@ -312,7 +312,6 @@ public class DaprRun implements Stoppable {
.append(ports.getAppPort() != null ? " --app-port " + ports.getAppPort() : "")
.append(ports.getHttpPort() != null ? " --dapr-http-port " + ports.getHttpPort() : "")
.append(ports.getGrpcPort() != null ? " --dapr-grpc-port " + ports.getGrpcPort() : "")
.append(" --log-level debug")
.append(isAppHealthCheckEnabled(serviceClass) ?
" --enable-app-health-check --app-health-probe-interval=1" : "")
.append(serviceClass == null ? "" :

View File

@ -77,13 +77,12 @@ public class MethodInvokeController {
}
@GetMapping(path = "/persons")
public List<Person> getPersons() {
return persons;
}
public List<Person> getPersons(@RequestParam(required = false) String uri) {
if (uri != null) {
System.out.println("MethodInvokeController->get persons with uri: " + uri);
}
@GetMapping(path = "/query")
public String getQueryParams(@RequestParam String uri) {
return uri;
return persons;
}
@PostMapping(path = "/sleep")

View File

@ -2,6 +2,7 @@ package io.dapr.it.methodinvoke.http;
import io.dapr.client.DaprClient;
import io.dapr.client.DaprClientBuilder;
import io.dapr.client.DaprHttp;
import io.dapr.client.domain.HttpExtension;
import io.dapr.exceptions.DaprException;
import io.dapr.it.BaseIT;
@ -91,7 +92,9 @@ public class MethodInvokeIT extends BaseIT {
client.invokeMethod(daprRun.getAppName(), "persons/1", null, HttpExtension.DELETE).block();
persons = Arrays.asList(client.invokeMethod(daprRun.getAppName(), "persons", null, HttpExtension.GET, Person[].class).block());
Map<String, List<String>> queryParams = Map.of("uri", List.of("abc/pqr"));
HttpExtension httpExtension = new HttpExtension(DaprHttp.HttpMethods.GET, queryParams, Map.of());
persons = Arrays.asList(client.invokeMethod(daprRun.getAppName(), "persons", null, httpExtension, Person[].class).block());
assertEquals(9, persons.size());
Person person = new Person();

View File

@ -1,46 +0,0 @@
package io.dapr.it.methodinvoke.http;
import io.dapr.client.DaprClient;
import io.dapr.client.DaprHttp;
import io.dapr.client.domain.HttpExtension;
import io.dapr.it.BaseIT;
import io.dapr.it.DaprRun;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MethodInvokeQueryParamEncodingIT extends BaseIT {
private DaprRun daprRun = null;
@BeforeEach
public void init() throws Exception {
daprRun = startDaprApp(
MethodInvokeQueryParamEncodingIT.class.getSimpleName() + "http",
MethodInvokeService.SUCCESS_MESSAGE,
MethodInvokeService.class,
true,
30000);
daprRun.waitForAppHealth(20000);
}
@Test
public void testInvokeQueryParams() throws Exception {
try (DaprClient client = daprRun.newDaprClientBuilder().build()) {
client.waitForSidecar(10000).block();
String uri = "abc/pqr";
Map<String, List<String>> queryParams = Map.of("uri", List.of(uri));
HttpExtension httpExtension = new HttpExtension(DaprHttp.HttpMethods.GET, queryParams, Map.of());
String result = client.invokeMethod(daprRun.getAppName(), "query", null,
httpExtension, String.class).block();
assertEquals(uri, result);
}
}
}