Skip to content

Commit

Permalink
Polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
nebhale committed May 22, 2018
1 parent 3127fd5 commit 1495e03
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static Buffer getBuffer(String path) {

public void assertEquals(RecordedRequest request) {
assertThat(getMethod()).hasToString(request.getMethod());
assertThat(getPath()).isEqualTo(extractPath(request));
assertThat(extractPath(request)).isEqualTo(getPath());

assertThat(request.getHeader(HttpHeaderNames.TRANSFER_ENCODING.toString())).as("Does not have Transfer-Encoding header").isNull();

Expand All @@ -69,12 +69,12 @@ public void assertEquals(RecordedRequest request) {
if (value == null) {
assertThat(request.getHeader(key)).as("Does not have %s header", key).isNull();
} else {
assertThat(value).isEqualTo(request.getHeader(key));
assertThat(request.getHeader(key)).as("Header %s value", key).isEqualTo(value);
}
});

if (getPayload().isPresent()) {
assertBodyEquals(getPayload().map(_TestRequest::getBuffer).get(), request.getBody());
assertBodyEquals(request.getBody(), getPayload().map(_TestRequest::getBuffer).get());
} else if (getContents().isPresent()) {
getContents().get().accept(Tuples.of(request.getHeaders(), request.getBody()));
} else {
Expand All @@ -93,8 +93,8 @@ public void assertEquals(RecordedRequest request) {

abstract Optional<String> getPayload();

private static void assertBodyEquals(Buffer expectedBuffer, Buffer actualBuffer) {
assertThat(getValue(expectedBuffer)).isEqualTo(getValue(actualBuffer));
private static void assertBodyEquals(Buffer actualBuffer, Buffer expectedBuffer) {
assertThat(getValue(actualBuffer)).isEqualTo(getValue(expectedBuffer));
}

private static Object getValue(Buffer buffer) {
Expand Down

0 comments on commit 1495e03

Please sign in to comment.