Skip to content

Commit 44e12c8

Browse files
brian-mulierz16dslow
brian-mulier
and
z16dslow
authored
ft/gzip-encoded (#148)
* add the possibility to gzip a json body (#143) * add the possibility to gzip a json body * add test * parse request before compressing + generify interaction * pass to yaml in the test * Use an already step instead of a new one * Remove the body.type check * put byte[] for body.type * put byte[] for body.type * Review brian * Review Brian * remove unused import * WIP: test to be done * ft: we can now send gzip content by setting Content-Encoding: gzip header * ft: we can now send gzip content by setting Content-Encoding: gzip header --------- Co-authored-by: z16dslow <[email protected]>
1 parent 6a592fa commit 44e12c8

File tree

4 files changed

+121
-5
lines changed

4 files changed

+121
-5
lines changed

‎tzatziki-http/src/main/java/com/decathlon/tzatziki/steps/HttpSteps.java

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,18 @@
2020
import org.mockserver.model.LogEventRequestAndResponse;
2121
import org.mockserver.verify.VerificationTimes;
2222

23+
import java.io.ByteArrayOutputStream;
24+
import java.io.IOException;
2325
import java.lang.reflect.Type;
26+
import java.nio.charset.StandardCharsets;
2427
import java.util.*;
2528
import java.util.concurrent.atomic.AtomicInteger;
2629
import java.util.function.Function;
2730
import java.util.function.UnaryOperator;
2831
import java.util.regex.Matcher;
2932
import java.util.regex.Pattern;
3033
import java.util.stream.Collectors;
34+
import java.util.zip.GZIPOutputStream;
3135

3236
import static com.decathlon.tzatziki.utils.Asserts.withFailMessage;
3337
import static com.decathlon.tzatziki.utils.Comparison.COMPARING_WITH;
@@ -262,7 +266,40 @@ public void send(Guard guard, String user, Method method, String path, Type type
262266

263267
@When(THAT + GUARD + "(" + A_USER + ")sends? on " + QUOTED_CONTENT + ":$")
264268
public void send(Guard guard, String user, String path, String content) {
265-
guard.in(objects, () -> send(user, path, read(objects.resolve(content), Request.class)));
269+
guard.in(objects, () -> {
270+
Interaction.Request request = read(objects.resolve(content), Interaction.Request.class);
271+
if (Optional.ofNullable(request.headers.get("Content-Encoding")).map(encoding -> encoding.contains("gzip")).orElse(false)) {
272+
request = toRequestWithGzipBody(request);
273+
}
274+
275+
send(user, path, request);
276+
});
277+
}
278+
279+
private static Request toRequestWithGzipBody(Request request) {
280+
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
281+
try (GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream)) {
282+
String payload;
283+
if (request.body.payload instanceof String strPayload) {
284+
payload = strPayload;
285+
} else {
286+
payload = Mapper.toJson(request.body.payload);
287+
}
288+
289+
gzipOutputStream.write(payload.getBytes(StandardCharsets.UTF_8));
290+
} catch (IOException e) {
291+
throw new AssertionError(e.getMessage(), e);
292+
}
293+
294+
request = Request.builder()
295+
.body(Interaction.Body.builder()
296+
.type(byte[].class.getTypeName())
297+
.payload(byteArrayOutputStream.toByteArray())
298+
.build())
299+
.headers(request.headers)
300+
.method(request.method)
301+
.build();
302+
return request;
266303
}
267304

268305
public void send(String user, String path, Request request) {
@@ -497,7 +534,7 @@ public void after() {
497534
// we make a second pass, the calls might have been handled later on
498535
requestAndResponses.stream()
499536
.filter(requestAndResponse -> !Optional.ofNullable(requestAndResponse.getHttpResponse().getReasonPhrase()).orElse("").matches(notFoundMessageRegex))
500-
.forEach(requestAndResponse -> unhandledRequests.remove((HttpRequest) requestAndResponse.getHttpRequest()));
537+
.forEach(requestAndResponse -> unhandledRequests.remove(requestAndResponse.getHttpRequest()));
501538
// then we ignore allowed unhandled requests
502539
allowedUnhandledRequests.forEach(allowedUnhandledRequest -> {
503540
List<HttpRequest> requests = retrieveRecordedRequests(allowedUnhandledRequest.clone().withHeaders(Collections.emptyList()).withBody((Body<?>) null));
@@ -531,7 +568,7 @@ private RequestSpecification as(String user) {
531568
}
532569

533570
public static HttpStatusCode getHttpStatusCode(String value) {
534-
if (value.matches("[0-9]+")) {
571+
if (value.matches("\\d+")) {
535572
// code as int
536573
return HttpStatusCode.code(Integer.parseInt(value));
537574
}

‎tzatziki-http/src/main/java/com/decathlon/tzatziki/utils/Interaction.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,12 @@ public io.restassured.response.Response send(RequestSpecification request, Strin
124124
}
125125
}
126126
request.contentType(contentType);
127-
request.body(body.toString(objects));
127+
128+
if(body.payload instanceof byte[] payload){
129+
request.body(payload);
130+
}else{
131+
request.body(body.toString(objects));
132+
}
128133
}
129134
return request.request(method.name(), path);
130135
}

‎tzatziki-http/src/test/java/com/decathlon/tzatziki/steps/LocalSteps.java

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@
88
import io.cucumber.java.en.Given;
99
import io.cucumber.java.en.Then;
1010
import lombok.RequiredArgsConstructor;
11+
import org.junit.jupiter.api.Assertions;
1112

13+
import java.io.*;
14+
import java.net.ServerSocket;
15+
import java.net.Socket;
1216
import java.util.List;
1317
import java.util.concurrent.CompletableFuture;
1418
import java.util.concurrent.ExecutorService;
1519
import java.util.concurrent.Executors;
20+
import java.util.regex.Matcher;
21+
import java.util.regex.Pattern;
1622
import java.util.stream.IntStream;
1723

24+
import static com.decathlon.tzatziki.utils.Guard.GUARD;
1825
import static com.decathlon.tzatziki.utils.MockFaster.target;
19-
import static com.decathlon.tzatziki.utils.Patterns.QUOTED_CONTENT;
26+
import static com.decathlon.tzatziki.utils.Patterns.*;
2027
import static com.decathlon.tzatziki.utils.Unchecked.unchecked;
2128
import static io.restassured.RestAssured.given;
2229

@@ -45,6 +52,48 @@ public void mockIdEndpointAsSeveralMocks(int startId, int endId) {
4552
""".formatted(idx)));
4653
}
4754

55+
@Given(THAT + "we listen for incoming request on a test-specific socket")
56+
public void listenPort() throws IOException {
57+
ServerSocket serverSocket = new ServerSocket(0);
58+
objects.add("serverSocket", serverSocket);
59+
new Thread(() -> {
60+
try {
61+
Socket clientSocket = serverSocket.accept();
62+
BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
63+
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(clientSocket.getOutputStream()));
64+
65+
StringBuilder stringBuilder = new StringBuilder();
66+
int contentLength = 0;
67+
Pattern contentLengthPattern = Pattern.compile("Content-Length: (\\d*)");
68+
String line;
69+
while ((line = in.readLine()) != null && !line.isEmpty()) {
70+
stringBuilder.append(line).append("\n");
71+
Matcher contentLengthMatcher = contentLengthPattern.matcher(line);
72+
if (contentLengthMatcher.matches()) contentLength = Integer.parseInt(contentLengthMatcher.group(1));
73+
}
74+
75+
char[] body = new char[contentLength];
76+
in.read(body, 0, contentLength);
77+
stringBuilder.append("\n").append(body);
78+
objects.add("bodyChecksum", IntStream.range(0, body.length).mapToLong(i -> (long) body[i]).sum());
79+
out.write("HTTP/1.1 200 OK\r\n");
80+
out.flush();
81+
82+
in.close();
83+
out.close();
84+
clientSocket.close();
85+
serverSocket.close();
86+
} catch (IOException e) {
87+
throw new RuntimeException(e);
88+
}
89+
}).start();
90+
}
91+
92+
@Then(THAT + GUARD + "the received body on server socket checksum is equal to " + NUMBER)
93+
public void receivedBodyOnSocket(Guard guard, long checksum) {
94+
guard.in(objects, () -> Assertions.assertEquals((long) objects.get("bodyChecksum"), checksum));
95+
}
96+
4897
@Then("getting (?:on )?" + QUOTED_CONTENT + " four times in parallel returns:$")
4998
public void sendInParallel(String path, String content) {
5099
ExecutorService executor = Executors.newFixedThreadPool(4);

‎tzatziki-http/src/test/resources/com/decathlon/tzatziki/steps/http.feature

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,6 +1299,31 @@ Feature: to interact with an http service and setup mocks
12991299
X-Request-ID: null
13001300
"""
13011301

1302+
Scenario Template: we support gzip compression when content-encoding header contains 'gzip'
1303+
Given that we listen for incoming request on a test-specific socket
1304+
When we send on "http://127.0.0.1:{{{[serverSocket.localPort]}}}":
1305+
"""yaml
1306+
method: POST
1307+
headers.Content-Encoding: gzip
1308+
body:
1309+
payload: '<rawBody>'
1310+
"""
1311+
Then the received body on server socket checksum is equal to <gzipEncodedBodyChecksum>
1312+
1313+
Given that we listen for incoming request on a test-specific socket
1314+
When we send on "http://127.0.0.1:{{{[serverSocket.localPort]}}}":
1315+
"""yaml
1316+
method: POST
1317+
body:
1318+
payload: '<rawBody>'
1319+
"""
1320+
Then it is not true that the received body on server socket checksum is equal to <gzipEncodedBodyChecksum>
1321+
1322+
Examples:
1323+
| rawBody | gzipEncodedBodyChecksum |
1324+
| {"message": "hi"} | 721742 |
1325+
| <message>hi</message> | 592077 |
1326+
13021327
@ignore @run-manually
13031328
Scenario Template: Mocks from other tests should be considered as unhandled requests
13041329
* a root logger set to INFO

0 commit comments

Comments
 (0)