Add kotlin-test-junit5 to Kotlin projects

Closes gh-1297
spring-io · Jun 5, 2024 · 999f53c · 999f53c
1 parent be6fb64
commit 999f53c
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 3 deletions.
diff --git a/.../java/io/spring/initializr/generator/spring/code/kotlin/KotlinDependenciesConfigurer.java b/.../java/io/spring/initializr/generator/spring/code/kotlin/KotlinDependenciesConfigurer.java
@@ -26,6 +26,7 @@
  * Kotlin.
  *
  * @author Andy Wilkinson
+ * @author Moritz Halbritter
  */
 class KotlinDependenciesConfigurer implements BuildCustomizer<Build> {
 
@@ -34,6 +35,9 @@ public void customize(Build build) {
 		build.dependencies()
 			.add("kotlin-reflect", Dependency.withCoordinates("org.jetbrains.kotlin", "kotlin-reflect")
 				.scope(DependencyScope.COMPILE));
+		build.dependencies()
+			.add("kotlin-test-junit5", Dependency.withCoordinates("org.jetbrains.kotlin", "kotlin-test-junit5")
+				.scope(DependencyScope.TEST_COMPILE));
 	}
 
 }
diff --git a/.../io/spring/initializr/generator/spring/code/kotlin/KotlinDependenciesConfigurerTests.java b/.../io/spring/initializr/generator/spring/code/kotlin/KotlinDependenciesConfigurerTests.java
@@ -17,6 +17,7 @@
 package io.spring.initializr.generator.spring.code.kotlin;
 
 import io.spring.initializr.generator.buildsystem.Dependency;
+import io.spring.initializr.generator.buildsystem.DependencyScope;
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuild;
 import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
 import org.junit.jupiter.api.Test;
@@ -27,29 +28,40 @@
  * Tests for {@link KotlinDependenciesConfigurer}.
  *
  * @author Andy Wilkinson
+ * @author Moritz Halbritter
  */
 class KotlinDependenciesConfigurerTests {
 
 	@Test
 	void configuresDependenciesForGradleBuild() {
 		GradleBuild build = new GradleBuild();
 		new KotlinDependenciesConfigurer().customize(build);
-		assertThat(build.dependencies().ids()).containsOnly("kotlin-reflect");
+		assertThat(build.dependencies().ids()).containsOnly("kotlin-reflect", "kotlin-test-junit5");
 		Dependency kotlinReflect = build.dependencies().get("kotlin-reflect");
 		assertThat(kotlinReflect.getGroupId()).isEqualTo("org.jetbrains.kotlin");
 		assertThat(kotlinReflect.getArtifactId()).isEqualTo("kotlin-reflect");
 		assertThat(kotlinReflect.getVersion()).isNull();
+		Dependency kotlinTest = build.dependencies().get("kotlin-test-junit5");
+		assertThat(kotlinTest.getGroupId()).isEqualTo("org.jetbrains.kotlin");
+		assertThat(kotlinTest.getArtifactId()).isEqualTo("kotlin-test-junit5");
+		assertThat(kotlinTest.getScope()).isEqualTo(DependencyScope.TEST_COMPILE);
+		assertThat(kotlinTest.getVersion()).isNull();
 	}
 
 	@Test
 	void configuresDependenciesForMavenBuild() {
 		MavenBuild build = new MavenBuild();
 		new KotlinDependenciesConfigurer().customize(build);
-		assertThat(build.dependencies().ids()).containsOnly("kotlin-reflect");
+		assertThat(build.dependencies().ids()).containsOnly("kotlin-reflect", "kotlin-test-junit5");
 		Dependency kotlinReflect = build.dependencies().get("kotlin-reflect");
 		assertThat(kotlinReflect.getGroupId()).isEqualTo("org.jetbrains.kotlin");
 		assertThat(kotlinReflect.getArtifactId()).isEqualTo("kotlin-reflect");
 		assertThat(kotlinReflect.getVersion()).isNull();
+		Dependency kotlinTest = build.dependencies().get("kotlin-test-junit5");
+		assertThat(kotlinTest.getGroupId()).isEqualTo("org.jetbrains.kotlin");
+		assertThat(kotlinTest.getArtifactId()).isEqualTo("kotlin-test-junit5");
+		assertThat(kotlinTest.getScope()).isEqualTo(DependencyScope.TEST_COMPILE);
+		assertThat(kotlinTest.getVersion()).isNull();
 	}
 
 }
diff --git a/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

diff --git a/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen b/...izr-generator-spring/src/test/resources/project/gradle/kotlin-java11-build.gradle.kts.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/build.gradle.kts.gen
@@ -22,6 +22,7 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/pom.xml.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/pom.xml.gen
@@ -38,6 +38,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.gen
@@ -24,6 +24,7 @@ dependencies {
 	implementation 'org.jetbrains.kotlin:kotlin-reflect'
 	providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

diff --git a/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen b/...lizr-generator-spring/src/test/resources/project/kotlin/standard/war-build.gradle.kts.gen
@@ -24,6 +24,7 @@ dependencies {
 	implementation("org.jetbrains.kotlin:kotlin-reflect")
 	providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
+	testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 

diff --git a/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-pom.xml.gen b/initializr-generator-spring/src/test/resources/project/kotlin/standard/war-pom.xml.gen
@@ -44,6 +44,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/initializr-generator-spring/src/test/resources/project/maven/kotlin-java11-pom.xml.gen b/initializr-generator-spring/src/test/resources/project/maven/kotlin-java11-pom.xml.gen
@@ -38,6 +38,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-test-junit5</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java b/...java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java
@@ -147,7 +147,7 @@ void kotlinRange() {
 		assertThat(project).containsFiles("src/main/kotlin/com/example/demo/DemoApplication.kt",
 				"src/test/kotlin/com/example/demo/DemoApplicationTests.kt",
 				"src/main/resources/application.properties");
-		assertThat(project).mavenBuild().hasDependenciesSize(4).hasProperty("kotlin.version", "1.4.31");
+		assertThat(project).mavenBuild().hasDependenciesSize(5).hasProperty("kotlin.version", "1.4.31");
 	}
 
 	@Test