Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@
import io.vertx.ext.web.validation.builder.ValidationHandlerBuilder;
import io.vertx.json.schema.JsonSchema;
import io.vertx.junit5.Checkpoint;
import io.vertx.junit5.VertxExtension;
import io.vertx.junit5.VertxTestContext;
import io.vertx.junit5.VertxTest;
import io.vertx.serviceproxy.ServiceBinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.concurrent.CountDownLatch;

import static io.vertx.ext.web.validation.builder.Bodies.json;
import static io.vertx.ext.web.validation.builder.Parameters.param;
Expand All @@ -46,7 +45,7 @@
/**
* @author Francesco Guardiani @slinkydeveloper
*/
@ExtendWith(VertxExtension.class)
@VertxTest
public class RouteToEBServiceHandlerTest extends BaseValidationHandlerTest {

MessageConsumer<JsonObject> consumer;
Expand All @@ -57,8 +56,8 @@ public void tearDown() {
}

@Test
public void serviceProxyTypedTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint(3);
public void serviceProxyTypedTest(Vertx vertx, Checkpoint checkpoint) {
CountDownLatch latch = checkpoint.asLatch(3);

AnotherTestService service = new AnotherTestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand Down Expand Up @@ -97,22 +96,21 @@ public void serviceProxyTypedTest(Vertx vertx, VertxTestContext testContext) {
testRequest(client, HttpMethod.POST, "/testE/123")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("id", 123).put("value", 1)))
.sendJson(new JsonObject().put("value", 1), testContext, checkpoint);
.sendJson(new JsonObject().put("value", 1), latch::countDown);

testRequest(client, HttpMethod.POST, "/testF/123")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonArray().add(1 + 123).add(2 + 123).add(3 + 123)))
.sendJson(new JsonArray().add(1).add(2).add(3), testContext, checkpoint);
.sendJson(new JsonArray().add(1).add(2).add(3), latch::countDown);

testRequest(client, HttpMethod.POST, "/testF/123")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("id", 123).put("value", 1)))
.sendJson(new JsonObject().put("value", 1), testContext, checkpoint);
.sendJson(new JsonObject().put("value", 1), latch::countDown);
}

@Test
public void serviceProxyDataObjectTest(Vertx vertx, VertxTestContext testContext) throws IOException {
Checkpoint checkpoint = testContext.checkpoint();
public void serviceProxyDataObjectTest(Vertx vertx, Checkpoint checkpoint) throws IOException {

AnotherTestService service = new AnotherTestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand Down Expand Up @@ -143,12 +141,11 @@ public void serviceProxyDataObjectTest(Vertx vertx, VertxTestContext testContext
testRequest(client, HttpMethod.POST, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(result))
.sendJson(data.toJson(), testContext, checkpoint);
.sendJson(data.toJson(), checkpoint);
}

@Test
public void emptyOperationResultTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint();
public void emptyOperationResultTest(Vertx vertx, Checkpoint checkpoint) {

TestService service = new TestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -165,12 +162,11 @@ public void emptyOperationResultTest(Vertx vertx, VertxTestContext testContext)
testRequest(client, HttpMethod.GET, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(emptyResponse())
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void authorizedUserTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint();
public void authorizedUserTest(Vertx vertx, Checkpoint checkpoint) {

TestService service = new TestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -191,12 +187,11 @@ public void authorizedUserTest(Vertx vertx, VertxTestContext testContext) {
testRequest(client, HttpMethod.GET, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("result", "Hello slinkydeveloper!")))
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void extraPayloadTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint();
public void extraPayloadTest(Vertx vertx, Checkpoint checkpoint) {

TestService service = new TestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -215,12 +210,12 @@ public void extraPayloadTest(Vertx vertx, VertxTestContext testContext) {
testRequest(client, HttpMethod.GET, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("result", "Hello slinkydeveloper!")))
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void serviceProxyManualFailureTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint(2);
public void serviceProxyManualFailureTest(Vertx vertx, Checkpoint checkpoint) {
CountDownLatch latch = checkpoint.asLatch(2);

FailureTestService service = new FailureTestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand Down Expand Up @@ -262,17 +257,16 @@ public void serviceProxyManualFailureTest(Vertx vertx, VertxTestContext testCont

testRequest(client, HttpMethod.POST, "/testFailure")
.expect(statusCode(501), statusMessage("error for Francesco"))
.sendJson(new JsonObject().put("hello", "Ciao").put("name", "Francesco"), testContext, checkpoint);
.sendJson(new JsonObject().put("hello", "Ciao").put("name", "Francesco"), latch::countDown);

testRequest(client, HttpMethod.POST, "/testException")
.expect(statusCode(500), statusMessage("Unknown failure: (RECIPIENT_FAILURE,-1)"))
.sendJson(new JsonObject().put("hello", "Ciao").put("name", "Francesco"), testContext, checkpoint);
.sendJson(new JsonObject().put("hello", "Ciao").put("name", "Francesco"), latch::countDown);
}


@Test
public void binaryDataTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint();
public void binaryDataTest(Vertx vertx, Checkpoint checkpoint) {

BinaryTestService service = new BinaryTestServiceImpl();
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -292,12 +286,11 @@ public void binaryDataTest(Vertx vertx, VertxTestContext testContext) {
testRequest(client, HttpMethod.GET, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(bodyResponse(Buffer.buffer(new byte[]{(byte) 0xb0}), "application/octet-stream"))
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void authorizationPropagationTest(Vertx vertx, VertxTestContext testContext) {
Checkpoint checkpoint = testContext.checkpoint();
public void authorizationPropagationTest(Vertx vertx, Checkpoint checkpoint) {

TestService service = new TestServiceImpl(vertx);
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -319,6 +312,6 @@ public void authorizationPropagationTest(Vertx vertx, VertxTestContext testConte
testRequest(client, HttpMethod.GET, "/test")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("result", "Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==")))
.send(testContext, checkpoint);
.send(checkpoint);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
import io.vertx.ext.web.validation.tests.BaseValidationHandlerTest;
import io.vertx.ext.web.validation.builder.ValidationHandlerBuilder;
import io.vertx.junit5.Checkpoint;
import io.vertx.junit5.VertxExtension;
import io.vertx.junit5.VertxTestContext;
import io.vertx.junit5.VertxTest;
import io.vertx.serviceproxy.ServiceBinder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import static io.vertx.ext.web.validation.builder.Parameters.param;
import static io.vertx.ext.web.validation.tests.testutils.TestRequest.jsonBodyResponse;
Expand All @@ -24,7 +22,7 @@
import static io.vertx.json.schema.common.dsl.Schemas.intSchema;

@SuppressWarnings("unchecked")
@ExtendWith(VertxExtension.class)
@VertxTest
public class RouteToEBServiceFuturesHandlerTest extends BaseValidationHandlerTest {

MessageConsumer<JsonObject> consumer;
Expand All @@ -35,8 +33,7 @@ public void tearDown() {
}

@Test
public void serviceProxyTypedTestWithRequestParameter(final Vertx vertx, final VertxTestContext testContext) {
final Checkpoint checkpoint = testContext.checkpoint();
public void serviceProxyTypedTestWithRequestParameter(final Vertx vertx, Checkpoint checkpoint) {

final FuturesService service = new FuturesServiceImpl();
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -52,12 +49,11 @@ public void serviceProxyTypedTestWithRequestParameter(final Vertx vertx, final V
testRequest(client, HttpMethod.POST, "/testFutureWithRequestParameter/123")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("param", 123)))
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void serviceProxyTypedTestWithIntParameter(final Vertx vertx, final VertxTestContext testContext) {
final Checkpoint checkpoint = testContext.checkpoint();
public void serviceProxyTypedTestWithIntParameter(final Vertx vertx, Checkpoint checkpoint) {

final FuturesService service = new FuturesServiceImpl();
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -73,12 +69,11 @@ public void serviceProxyTypedTestWithIntParameter(final Vertx vertx, final Vertx
testRequest(client, HttpMethod.POST, "/testFutureWithIntParameter/123")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("param", 123)))
.send(testContext, checkpoint);
.send(checkpoint);
}

@Test
public void serviceProxyTypedTest(final Vertx vertx, final VertxTestContext testContext) {
final Checkpoint checkpoint = testContext.checkpoint();
public void serviceProxyTypedTest(final Vertx vertx, Checkpoint checkpoint) {

final FuturesService service = new FuturesServiceImpl();
final ServiceBinder serviceBinder = new ServiceBinder(vertx).setAddress("someAddress");
Expand All @@ -94,7 +89,7 @@ public void serviceProxyTypedTest(final Vertx vertx, final VertxTestContext test
testRequest(client, HttpMethod.POST, "/testFuture")
.expect(statusCode(200), statusMessage("OK"))
.expect(jsonBodyResponse(new JsonObject().put("foo", "bar")))
.send(testContext, checkpoint);
.send(checkpoint);
}

}
Loading
Loading