Skip to content

Fix test failures on Windows causes by unexpected \r in JSON serialization #11

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
merged 1 commit into from
May 12, 2019
Merged

Fix test failures on Windows causes by unexpected \r in JSON serialization #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion gitlfs-client/src/test/java/ru/bozaro/gitlfs/client/HttpReplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ public HttpReplay(@NotNull List<HttpRecord> records) {
public HttpResponse executeMethod(@NotNull HttpUriRequest request) throws IOException {
final HttpRecord record = records.pollFirst();
Assert.assertNotNull(record);
Assert.assertEquals(record.getRequest().toString(), new HttpRecord.Request(request).toString());

final String expected = record.getRequest().toString();
final String actual = new HttpRecord.Request(request).toString();
Assert.assertEquals(actual, expected);

return record.getResponse().toHttpResponse();
}

Expand Down
10 changes: 10 additions & 0 deletions gitlfs-common/src/main/java/ru/bozaro/gitlfs/common/JsonHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.util.StdDateFormat;
import org.jetbrains.annotations.NotNull;

import static com.fasterxml.jackson.core.util.DefaultPrettyPrinter.DEFAULT_ROOT_VALUE_SEPARATOR;

/**
* Json utility class.
*
Expand All @@ -25,6 +29,12 @@ public static ObjectMapper createMapper() {
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
mapper.enable(SerializationFeature.INDENT_OUTPUT);
mapper.setDateFormat(new StdDateFormat());

// By default, pretty printer uses system newline. Explicitly configure it to use \n
mapper.setDefaultPrettyPrinter(
new DefaultPrettyPrinter(DEFAULT_ROOT_VALUE_SEPARATOR)
.withObjectIndenter(new DefaultIndenter(" ", "\n")));

mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
return mapper;
}
Expand Down