This commit is contained in:
Stephane Nicoll 2019-08-14 10:37:01 +02:00
parent 748afa124d
commit 1672c69ab9
2 changed files with 4 additions and 9 deletions

View File

@ -35,7 +35,6 @@ class GroovyDslKotlinGradleBuildCustomizerTests {
void kotlinPluginsAreConfigured() { void kotlinPluginsAreConfigured() {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build); new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build);
assertThat(build.plugins().values()).hasSize(2);
assertThat(build.plugins().values()).extracting("id", "version").containsExactlyInAnyOrder( assertThat(build.plugins().values()).extracting("id", "version").containsExactlyInAnyOrder(
Tuple.tuple("org.jetbrains.kotlin.jvm", "1.2.70"), Tuple.tuple("org.jetbrains.kotlin.jvm", "1.2.70"),
Tuple.tuple("org.jetbrains.kotlin.plugin.spring", "1.2.70")); Tuple.tuple("org.jetbrains.kotlin.plugin.spring", "1.2.70"));

View File

@ -16,11 +16,9 @@
package io.spring.initializr.generator.spring.code.kotlin; package io.spring.initializr.generator.spring.code.kotlin;
import java.util.Collections;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuild; import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
import io.spring.initializr.generator.buildsystem.gradle.GradleBuild.TaskCustomization; import io.spring.initializr.generator.buildsystem.gradle.GradleBuild.TaskCustomization;
import io.spring.initializr.generator.buildsystem.gradle.StandardGradlePlugin; import org.assertj.core.groups.Tuple;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -36,11 +34,9 @@ class KotlinDslKotlinGradleBuildCustomizerTests {
void kotlinPluginsAreConfigured() { void kotlinPluginsAreConfigured() {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build); new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build);
assertThat(build.plugins().values()).hasSize(2); assertThat(build.plugins().values()).extracting("id", "version").containsExactlyInAnyOrder(
assertThat(build.plugins().values().map( Tuple.tuple("org.jetbrains.kotlin.jvm", "1.2.70"),
(plugin) -> Collections.singletonMap(plugin.getId(), ((StandardGradlePlugin) plugin).getVersion()))) Tuple.tuple("org.jetbrains.kotlin.plugin.spring", "1.2.70"));
.containsExactlyInAnyOrder(Collections.singletonMap("org.jetbrains.kotlin.jvm", "1.2.70"),
Collections.singletonMap("org.jetbrains.kotlin.plugin.spring", "1.2.70"));
} }
@Test @Test