zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-22 02:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update more dependencies to newer versions (#999)

Browse source 
* Update more dependencies to newer versions

* Add lockfiles and back out 2 problematic dep updates

* Fix the build (backs out more changes)

* Back out qdox 2.0 too
This commit is contained in:
Ben McIlwain 2021-03-10 11:22:07 -05:00 • committed by GitHub
parent 765a6b9bc3
commit e5801e1b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 2325 additions and 2334 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java
View file

@ -21,7 +21,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import com.github.difflib.DiffUtils;
import com.github.difflib.UnifiedDiffUtils;
import com.github.difflib.algorithm.DiffException;
import com.github.difflib.patch.Patch;
import com.github.difflib.text.DiffRow;
import com.github.difflib.text.DiffRowGenerator;
@ -132,12 +131,7 @@ public class TextDiffSubject extends Subject {
static String generateUnifiedDiff(
ImmutableList<String> expectedContent, ImmutableList<String> actualContent) {
Patch<String> diff;
try {
diff = DiffUtils.diff(expectedContent, actualContent);
} catch (DiffException e) {
throw new RuntimeException(e);
}
Patch<String> diff = DiffUtils.diff(expectedContent, actualContent);
List<String> unifiedDiff =
UnifiedDiffUtils.generateUnifiedDiff("expected", "actual", expectedContent, diff, 0);
@ -153,12 +147,7 @@ public class TextDiffSubject extends Subject {
.oldTag(f -> "~")
.newTag(f -> "**")
.build();
List<DiffRow> rows;
try {
rows = generator.generateDiffRows(expectedContent, actualContent);
} catch (DiffException e) {
throw new RuntimeException(e);
}
List<DiffRow> rows = generator.generateDiffRows(expectedContent, actualContent);
int maxExpectedLineLength =
findMaxLineLength(rows.stream().map(DiffRow::getOldLine).collect(Collectors.toList()));