diff --git a/common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java b/common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java index 80bf5e187..a30c0658a 100644 --- a/common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java +++ b/common/src/testing/java/google/registry/testing/truth/TextDiffSubject.java @@ -92,17 +92,19 @@ public class TextDiffSubject extends Subject { private ImmutableList filterComments(List lines) { return lines.stream() + .filter(line -> !line.isBlank()) .filter(line -> comments.stream().noneMatch(line::startsWith)) .collect(ImmutableList.toImmutableList()); } public void hasSameContentAs(List expectedContent) { checkNotNull(expectedContent, "expectedContent"); - ImmutableList expected = filterComments(expectedContent); - if (filterComments(expected).equals(filterComments(actual))) { + ImmutableList filteredExpected = filterComments(expectedContent); + ImmutableList filteredActual = filterComments(actual); + if (filteredExpected.equals(filteredActual)) { return; } - String diffString = diffFormat.generateDiff(expected, actual); + String diffString = diffFormat.generateDiff(filteredExpected, filteredActual); failWithoutActual( Fact.simpleFact( Joiner.on('\n') diff --git a/db/src/test/java/google/registry/sql/flyway/SchemaTest.java b/db/src/test/java/google/registry/sql/flyway/SchemaTest.java index ce810b0f6..90ac0b8ce 100644 --- a/db/src/test/java/google/registry/sql/flyway/SchemaTest.java +++ b/db/src/test/java/google/registry/sql/flyway/SchemaTest.java @@ -115,7 +115,7 @@ class SchemaTest { Joiner.on(File.separatorChar).join(MOUNTED_RESOURCE_PATH, DUMP_OUTPUT_FILE)); assertThat(dumpedSchema) - .ignoringLinesStartingWith("--") + .ignoringLinesStartingWith("--", "\\restrict", "\\unrestrict") .hasSameContentAs(Resources.getResource("sql/schema/nomulus.golden.sql")); }