Skip to content

#patch: Fixes #126 leading/trailing whitespace causing snapshot failures #127

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
jackmatt2 merged 2 commits into from
Dec 10, 2022
Merged

#patch: Fixes #126 leading/trailing whitespace causing snapshot failures #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f510e
#patch: Fixes #126 leading/trailing whitespace causing snapshot failures
jackmatt2 Dec 10, 2022
0617d1b
rename method
jackmatt2 Dec 10, 2022
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
25 changes: 6 additions & 19 deletions ...ng-core/src/main/java/au/com/origin/snapshots/serializers/ToStringSnapshotSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
import au.com.origin.snapshots.Snapshot;
import au.com.origin.snapshots.SnapshotFile;
import au.com.origin.snapshots.SnapshotSerializerContext;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;

/**
Expand All @@ -18,22 +15,12 @@ public class ToStringSnapshotSerializer implements SnapshotSerializer {

@Override
public Snapshot apply(Object object, SnapshotSerializerContext gen) {
List<Object> objects = Arrays.asList(object);
String body =
"[\n"
+ objects.stream()
.map(Object::toString)
.map(
it -> {
if (it.contains(SnapshotFile.SPLIT_STRING)) {
log.warn(
"Found 3 consecutive lines in your snapshot \\n\\n\\n. This sequence is reserved as the snapshot separator - replacing with \\n.\\n.\\n");
return it.replaceAll(SnapshotFile.SPLIT_STRING, "\n.\n.\n");
}
return it;
})
.collect(Collectors.joining("\n"))
+ "\n]";
String body = "[\n" + object.toString() + "\n]";
if (body.contains(SnapshotFile.SPLIT_STRING)) {
log.warn(
"Found 3 consecutive lines in your snapshot \\n\\n\\n. This sequence is reserved as the snapshot separator - replacing with \\n.\\n.\\n");
body = body.replaceAll(SnapshotFile.SPLIT_STRING, "\n.\n.\n");
}
return gen.toSnapshot(body);
}

Expand Down
18 changes: 18 additions & 0 deletions ...ore/src/test/java/au/com/origin/snapshots/serializers/ToStringSnapshotSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ void shouldReplaceThreeConsecutiveNewLines() {
assertThat(result.getBody()).isEqualTo("[\nJohn\n.\n.\nDoe\n]");
}

@Test
void shouldReplaceTwoConsecutiveNewLinesAtEnd() {
Snapshot result = serializer.apply("John Doe\n\n", mockSnapshotGenerator);
assertThat(result.getBody()).isEqualTo("[\nJohn Doe\n.\n.\n]");
}

@Test
void shouldReplaceTwoConsecutiveNewLinesAtBeginning() {
Snapshot result = serializer.apply("\n\nJohn Doe", mockSnapshotGenerator);
assertThat(result.getBody()).isEqualTo("[\n.\n.\nJohn Doe\n]");
}

@Test
void shouldReplaceIllegalNewlineSequencesEverywhere() {
Snapshot result = serializer.apply("\n\nJohn\n\n\nDoe\n\n", mockSnapshotGenerator);
assertThat(result.getBody()).isEqualTo("[\n.\n.\nJohn\n.\n.\nDoe\n.\n.\n]");
}

@AllArgsConstructor
@Data
private static class Dummy {
Expand Down