diff --git a/buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java b/buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java index f362c43e90e..75c92ae969f 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; import org.junit.jupiter.api.Test; @@ -193,11 +194,11 @@ class AntoraAsciidocAttributesTests { @Test void urlLinksFromLibrary() { - Map links = new LinkedHashMap<>(); - links.put("site", new Link((version) -> "https://example.com/site/" + version, null)); - links.put("docs", new Link((version) -> "https://example.com/docs/" + version, null)); - links.put("javadoc", new Link((version) -> "https://example.com/api/" + version, - List.of("org.springframework.[core|util]"))); + Map> links = new LinkedHashMap<>(); + links.put("site", singleLink((version) -> "https://example.com/site/" + version)); + links.put("docs", singleLink((version) -> "https://example.com/docs/" + version)); + links.put("javadoc", + singleLink((version) -> "https://example.com/api/" + version, "org.springframework.[core|util]")); Library library = mockLibrary(links); AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3.1-SNAPSHOT", false, BuildType.OPEN_SOURCE, List.of(library), mockDependencyVersions(), null); @@ -209,6 +210,11 @@ class AntoraAsciidocAttributesTests { .containsEntry("javadoc-location-org-springframework-util", "{url-spring-framework-javadoc}"); } + private List singleLink(Function factory, String... packages) { + Link link = new Link(null, factory, List.of(packages)); + return List.of(link); + } + @Test void linksFromProperties() { Map attributes = new AntoraAsciidocAttributes("1.2.3-SNAPSHOT", true, BuildType.OPEN_SOURCE, @@ -221,7 +227,7 @@ class AntoraAsciidocAttributesTests { assertThat(keys.indexOf("include-java")).isLessThan(keys.indexOf("code-spring-boot-latest")); } - private Library mockLibrary(Map links) { + private Library mockLibrary(Map> links) { String name = "Spring Framework"; String calendarName = null; LibraryVersion version = new LibraryVersion(DependencyVersion.parse("1.2.3")); @@ -254,9 +260,10 @@ class AntoraAsciidocAttributesTests { addMockSpringDataVersion(versions, "spring-data-redis", version); addMockSpringDataVersion(versions, "spring-data-rest-core", version); addMockSpringDataVersion(versions, "spring-data-ldap", version); - addMockJacksonVersion(versions, "jackson-annotations", version); - addMockJacksonVersion(versions, "jackson-core", version); - addMockJacksonVersion(versions, "jackson-databind", version); + addMockJacksonCoreVersion(versions, "jackson-annotations", version); + addMockJacksonCoreVersion(versions, "jackson-core", version); + addMockJacksonCoreVersion(versions, "jackson-databind", version); + versions.put("com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version); return versions; } @@ -264,7 +271,7 @@ class AntoraAsciidocAttributesTests { versions.put("org.springframework.data:" + artifactId, version); } - private void addMockJacksonVersion(Map versions, String artifactId, String version) { + private void addMockJacksonCoreVersion(Map versions, String artifactId, String version) { versions.put("com.fasterxml.jackson.core:" + artifactId, version); } diff --git a/buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java b/buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java index c507270659d..768617a6763 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java @@ -49,7 +49,7 @@ class LibraryTests { VersionAlignment versionAlignment = null; String alignsWithBom = null; String linkRootName = null; - Map links = Collections.emptyMap(); + Map> links = Collections.emptyMap(); Library library = new Library(name, calendarName, version, groups, prohibitedVersion, considerSnapshots, versionAlignment, alignsWithBom, linkRootName, links); assertThat(library.getLinkRootName()).isEqualTo("spring-framework"); @@ -66,7 +66,7 @@ class LibraryTests { VersionAlignment versionAlignment = null; String alignsWithBom = null; String linkRootName = "spring-data"; - Map links = Collections.emptyMap(); + Map> links = Collections.emptyMap(); Library library = new Library(name, calendarName, version, groups, prohibitedVersion, considerSnapshots, versionAlignment, alignsWithBom, linkRootName, links); assertThat(library.getLinkRootName()).isEqualTo("spring-data"); diff --git a/buildSrc/src/test/java/org/springframework/boot/build/testing/TestFailuresPluginIntegrationTests.java b/buildSrc/src/test/java/org/springframework/boot/build/testing/TestFailuresPluginIntegrationTests.java index 4df3756576b..d33b1a87656 100644 --- a/buildSrc/src/test/java/org/springframework/boot/build/testing/TestFailuresPluginIntegrationTests.java +++ b/buildSrc/src/test/java/org/springframework/boot/build/testing/TestFailuresPluginIntegrationTests.java @@ -58,7 +58,7 @@ class TestFailuresPluginIntegrationTests { .buildAndFail(); assertThat(readLines(result.getOutput())).containsSequence("Found test failures in 1 test task:", "", ":test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", - " example.MoreTests > bad()", " example.MoreTests > fail()", ""); + " example.MoreTests > bad()", " example.MoreTests > fail()"); } @Test @@ -72,7 +72,7 @@ class TestFailuresPluginIntegrationTests { .buildAndFail(); assertThat(readLines(result.getOutput())).containsSequence("Found test failures in 1 test task:", "", ":project-one:test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", - " example.MoreTests > bad()", " example.MoreTests > fail()", ""); + " example.MoreTests > bad()", " example.MoreTests > fail()"); } @Test @@ -88,7 +88,7 @@ class TestFailuresPluginIntegrationTests { ":project-one:test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", " example.MoreTests > bad()", " example.MoreTests > fail()", "", ":project-two:test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", - " example.MoreTests > bad()", " example.MoreTests > fail()", ""); + " example.MoreTests > bad()", " example.MoreTests > fail()"); } @Test @@ -104,7 +104,7 @@ class TestFailuresPluginIntegrationTests { ":project-one:test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", " example.MoreTests > bad()", " example.MoreTests > fail()", "", ":project-two:test", " example.ExampleTests > bad()", " example.ExampleTests > fail()", - " example.MoreTests > bad()", " example.MoreTests > fail()", ""); + " example.MoreTests > bad()", " example.MoreTests > fail()"); } private void createProject(File dir) {