From 1672c69ab95e4cc88c27eb33ee3d346003d7a2f8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Aug 2019 10:37:01 +0200 Subject: [PATCH] Polish --- .../GroovyDslKotlinGradleBuildCustomizerTests.java | 1 - .../KotlinDslKotlinGradleBuildCustomizerTests.java | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java index 4f632a61..1a19e5c5 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java @@ -35,7 +35,6 @@ class GroovyDslKotlinGradleBuildCustomizerTests { void kotlinPluginsAreConfigured() { GradleBuild build = new GradleBuild(); new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build); - assertThat(build.plugins().values()).hasSize(2); assertThat(build.plugins().values()).extracting("id", "version").containsExactlyInAnyOrder( Tuple.tuple("org.jetbrains.kotlin.jvm", "1.2.70"), Tuple.tuple("org.jetbrains.kotlin.plugin.spring", "1.2.70")); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java index 0dd4425b..17f75913 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java @@ -16,11 +16,9 @@ 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.TaskCustomization; -import io.spring.initializr.generator.buildsystem.gradle.StandardGradlePlugin; +import org.assertj.core.groups.Tuple; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -36,11 +34,9 @@ class KotlinDslKotlinGradleBuildCustomizerTests { void kotlinPluginsAreConfigured() { GradleBuild build = new GradleBuild(); new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build); - assertThat(build.plugins().values()).hasSize(2); - assertThat(build.plugins().values().map( - (plugin) -> Collections.singletonMap(plugin.getId(), ((StandardGradlePlugin) plugin).getVersion()))) - .containsExactlyInAnyOrder(Collections.singletonMap("org.jetbrains.kotlin.jvm", "1.2.70"), - Collections.singletonMap("org.jetbrains.kotlin.plugin.spring", "1.2.70")); + assertThat(build.plugins().values()).extracting("id", "version").containsExactlyInAnyOrder( + Tuple.tuple("org.jetbrains.kotlin.jvm", "1.2.70"), + Tuple.tuple("org.jetbrains.kotlin.plugin.spring", "1.2.70")); } @Test