Skip to content

Handle newlines in release notes test #130134

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 5 commits into from
Jun 30, 2025
Merged

Handle newlines in release notes test #130134

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32ed4c0
Handle newlines in release notes test
rjernst Jun 26, 2025
49e63ad
tweak
rjernst Jun 26, 2025
2256646
Merge branch 'main' into build/release_notes_test_newlines
rjernst Jun 27, 2025
c4b3a3a
another try
rjernst Jun 27, 2025
de1395f
Merge branch 'main' into build/release_notes_test_newlines
rjernst Jun 28, 2025
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 ...al/src/test/java/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Objects;

import static org.elasticsearch.gradle.internal.release.GenerateReleaseNotesTask.getSortedBundlesWithUniqueChangelogs;
import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
Expand Down Expand Up @@ -100,7 +101,10 @@ public void testTemplate(String templateFilename, String outputFilename, List<Ch
writeResource(outputFile, actualOutput);
assertFalse("UPDATE_EXPECTED_OUTPUT should be set back to false after updating output", UPDATE_EXPECTED_OUTPUT);
} else {
assertThat(actualOutput, equalTo(expectedOutput));
String[] expectedLines = expectedOutput.replace("\r", "").split("\n");
String[] actualLines = actualOutput.split("\n");

assertThat(actualLines, arrayContaining(expectedLines));
}
}

Expand Down