Skip to content

Fix allure-httpclient request without body #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baev merged 3 commits into from
Jan 28, 2019
Merged

Fix allure-httpclient request without body #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e72c8bd
fix allure-httpclient request without body
useriq Jan 25, 2019
6f680a1
revert wildcard import
useriq Jan 25, 2019
7068c25
add test shouldCreateResponseAttachmentWithEmptyBody
useriq Jan 28, 2019
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
10 changes: 7 additions & 3 deletions allure-httpclient/src/main/java/io/qameta/allure/httpclient/AllureHttpClientResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ public void process(final HttpResponse response,
Stream.of(response.getAllHeaders())
.forEach(header -> builder.setHeader(header.getName(), header.getValue()));

final LoggableEntity loggableEntity = new LoggableEntity(response.getEntity());
response.setEntity(loggableEntity);
if (response.getEntity() != null) {
final LoggableEntity loggableEntity = new LoggableEntity(response.getEntity());
response.setEntity(loggableEntity);

builder.setBody(loggableEntity.getBody());
builder.setBody(loggableEntity.getBody());
} else {
builder.setBody("No body present");
}

final HttpResponseAttachment responseAttachment = builder.build();
processor.addAttachment(responseAttachment, renderer);
Expand Down
30 changes: 30 additions & 0 deletions allure-httpclient/src/test/java/io/qameta/allure/httpclient/AllureHttpClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ void setUp() {
stubFor(get(urlEqualTo("/hello"))
.willReturn(aResponse()
.withBody(BODY_STRING)));

stubFor(get(urlEqualTo("/empty"))
.willReturn(aResponse()
.withStatus(304)));
}

@AfterEach
Expand Down Expand Up @@ -110,4 +114,30 @@ void shouldCreateResponseAttachment() throws Exception {
.extracting("responseCode")
.containsExactly(200);
}

@Test
void shouldCreateResponseAttachmentWithEmptyBody() throws Exception {
final AttachmentRenderer<AttachmentData> renderer = mock(AttachmentRenderer.class);
final AttachmentProcessor<AttachmentData> processor = mock(AttachmentProcessor.class);

final HttpClientBuilder builder = HttpClientBuilder.create()
.addInterceptorLast(new AllureHttpClientResponse(renderer, processor));

try (CloseableHttpClient httpClient = builder.build()) {
final HttpGet httpGet = new HttpGet(String.format("http://localhost:%d/empty", server.port()));
try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
assertThat(response.getEntity())
.isEqualTo(null);
}
}

final ArgumentCaptor<AttachmentData> captor = ArgumentCaptor.forClass(AttachmentData.class);
verify(processor, times(1))
.addAttachment(captor.capture(), eq(renderer));

assertThat(captor.getAllValues())
.hasSize(1)
.extracting("body")
.containsExactly("No body present");
}
}