Skip to content

Commit c799977

Browse files
committed
Leave long strings outside the changed lines in the service tests
The tests of FormatterServicesTest and FormatDiffTest that reflow a long string on a changed line, with each of the in-process, bootstrapping and native formatters, get another long string, on a line that is not changed: it stays as it is.
1 parent 9485aec commit c799977

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

‎gradle-open-java-format/src/test/java/com/palantir/javaformat/gradle/FormatDiffTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,16 @@ void reflows_the_long_string_of_a_changed_line(FormatterService formatterService
9696
Path longString = repo.resolve("LongString.java");
9797
Files.writeString(longString, """
9898
class LongString {
99+
String outside = "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat sed.";
99100
}
100101
""");
101102
runCommandInRepo("git", "add", ".");
102103
runCommandInRepo("git", "commit", "-m", "A class");
103104

104105
Files.writeString(longString, """
105106
class LongString {
107+
String outside = "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat sed.";
108+
106109
String changed = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.";
107110
}
108111
""");
@@ -111,6 +114,8 @@ class LongString {
111114

112115
assertThat(longString).hasContent("""
113116
class LongString {
117+
String outside = "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat sed.";
118+
114119
String changed =
115120
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et"
116121
+ " dolore magna.";

‎open-java-format-jdk-bootstrap/src/test/java/com/palantir/javaformat/bootstrap/FormatterServicesTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,15 @@ public void main( String aaaa ) {
102102
void reflows_the_long_string_of_the_range(FormatterService formatterService) throws FormatterException {
103103
String input = """
104104
class S {
105+
String outside = "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat sed.";
106+
105107
String changed = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna.";
106108
}
107109
""";
108110
String expectedOutput = """
109111
class S {
112+
String outside = "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat sed.";
113+
110114
String changed =
111115
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et"
112116
+ " dolore magna.";

0 commit comments

Comments
 (0)