create testprojects for each module (#4)

klu2 · web-flow · commit 4468f9fb1d38 · 2023-01-09T09:13:03.000+01:00
* create testprojects for each module
* use Java 17
diff --git a/.github/workflows/github-build.yml b/.github/workflows/github-build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/github-publish.yml b/.github/workflows/github-publish.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     `maven-publish`
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
     signing
+    id("io.micronaut.test-resources") version "3.6.7" apply (false)
 }
 
 description = "Test-Resources for Spring Boot"
@@ -19,65 +20,72 @@ subprojects {
         mavenCentral()
     }
 
-    plugins.apply(MavenPublishPlugin::class)
-    plugins.apply(SigningPlugin::class)
+    if (!this.path.startsWith(":testprojects")) {
+        plugins.apply(MavenPublishPlugin::class)
+        plugins.apply(SigningPlugin::class)
+    }
 
     afterEvaluate {
 
-        if (!name.endsWith("-client")) {
+        if (this.subprojects.isEmpty()) {
             dependencies {
-                "implementation"(libs.micronaut.testresources.testcontainers)
+                "testImplementation"(libs.jupiter.api)
+                "testRuntimeOnly"(libs.jupiter.engine)
+                "testImplementation"(libs.assertj)
             }
         }
 
-        dependencies {
-            "testImplementation"(libs.jupiter.api)
-            "testRuntimeOnly"(libs.jupiter.engine)
-            "testImplementation"(libs.assertj)
-        }
+        if (!this.path.startsWith(":testprojects")) {
 
-        configure<PublishingExtension> {
-            publications {
-                create<MavenPublication>("maven") {
-                    from(components["java"])
-                    pom {
-                        name.set(project.name)
-                        description.set(project.description)
-                        url.set("https://github.com/cloudflightio/springboot-testresources")
-                        licenses {
-                            license {
-                                name.set("The Apache License, Version 2.0")
-                                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+            if (!name.endsWith("-client")) {
+                dependencies {
+                    "implementation"(libs.micronaut.testresources.testcontainers)
+                }
+            }
+
+            configure<PublishingExtension> {
+                publications {
+                    create<MavenPublication>("maven") {
+                        from(components["java"])
+                        pom {
+                            name.set(project.name)
+                            description.set(project.description)
+                            url.set("https://github.com/cloudflightio/springboot-testresources")
+                            licenses {
+                                license {
+                                    name.set("The Apache License, Version 2.0")
+                                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                                }
                             }
-                        }
-                        inceptionYear.set("2023")
-                        organization {
-                            name.set("Cloudflight")
-                            url.set("https://cloudflight.io")
-                        }
-                        developers {
-                            developer {
-                                id.set("cloudflight")
-                                name.set("Cloudflight Team")
-                                email.set("opensource@cloudflight.io")
+                            inceptionYear.set("2023")
+                            organization {
+                                name.set("Cloudflight")
+                                url.set("https://cloudflight.io")
+                            }
+                            developers {
+                                developer {
+                                    id.set("cloudflight")
+                                    name.set("Cloudflight Team")
+                                    email.set("opensource@cloudflight.io")
+                                }
+                            }
+                            scm {
+                                connection.set("scm:ggit@github.com:cloudflightio/springboot-testresources.git")
+                                developerConnection.set("scm:git@github.com:cloudflightio/springboot-testresources.git")
+                                url.set("https://github.com/cloudflightio/springboot-testresources")
                             }
-                        }
-                        scm {
-                            connection.set("scm:ggit@github.com:cloudflightio/springboot-testresources.git")
-                            developerConnection.set("scm:git@github.com:cloudflightio/springboot-testresources.git")
-                            url.set("https://github.com/cloudflightio/springboot-testresources")
                         }
                     }
                 }
             }
-        }
 
-        configure<SigningExtension> {
-            setRequired {
-                System.getenv("PGP_SECRET") != null
+            configure<SigningExtension> {
+                setRequired {
+                    System.getenv("PGP_SECRET") != null
+                }
+                useInMemoryPgpKeys(System.getenv("PGP_SECRET"), System.getenv("PGP_PASSPHRASE"))
+                sign(publishing.publications.getByName("maven"))
             }
-            useInMemoryPgpKeys(System.getenv("PGP_SECRET"), System.getenv("PGP_PASSPHRASE"))
-            sign(publishing.publications.getByName("maven"))
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,3 @@
 kotlin.code.style=official
+
+micronautVersion=3.6.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,3 +7,6 @@ rootProject.name = "springboot-testresources"
 include("springboot-testresources-client")
 include("springboot-testresources-minio")
 include("springboot-testresources-jdbc-mariadb")
+
+include("testprojects:jdbc:mariadb")
+include("testprojects:minio")
diff --git a/springboot-testresources-jdbc-mariadb/build.gradle.kts b/springboot-testresources-jdbc-mariadb/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("io.micronaut.test-resources")
+}
+
 description = "Spring Boot TestResourceProvider for MariaDB"
 
 dependencies {
diff --git a/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/AbstractJdbcTestResourceProvider.java b/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/AbstractJdbcTestResourceProvider.java
@@ -1,4 +1,4 @@
-package io.cloudflight.testresources.springboot;
+package io.cloudflight.testresources.springboot.jdbc.mariadb;
 
 import io.micronaut.testresources.testcontainers.AbstractTestContainersProvider;
 import org.testcontainers.containers.JdbcDatabaseContainer;
diff --git a/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProvider.java b/springboot-testresources-jdbc-mariadb/src/main/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProvider.java
@@ -1,4 +1,4 @@
-package io.cloudflight.testresources.springboot;
+package io.cloudflight.testresources.springboot.jdbc.mariadb;
 
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.utility.DockerImageName;
diff --git a/springboot-testresources-jdbc-mariadb/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver b/springboot-testresources-jdbc-mariadb/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver
@@ -1 +1 @@
-io.cloudflight.testresources.springboot.MariaDbTestResourcesProvider
+io.cloudflight.testresources.springboot.jdbc.mariadb.MariaDbTestResourcesProvider
diff --git a/springboot-testresources-jdbc-mariadb/src/test/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProviderTest.java b/springboot-testresources-jdbc-mariadb/src/test/java/io/cloudflight/testresources/springboot/jdbc/mariadb/MariaDbTestResourcesProviderTest.java
@@ -1,5 +1,6 @@
-package io.cloudflight.testresources.springboot;
+package io.cloudflight.testresources.springboot.jdbc.mariadb;
 
+import io.cloudflight.testresources.springboot.jdbc.mariadb.MariaDbTestResourcesProvider;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
diff --git a/springboot-testresources-minio/src/main/java/io/cloudflight/testresources/springboot/minio/MinioTestResourcesProvider.java b/springboot-testresources-minio/src/main/java/io/cloudflight/testresources/springboot/minio/MinioTestResourcesProvider.java
@@ -1,4 +1,4 @@
-package io.cloudflight.testresources.springboot;
+package io.cloudflight.testresources.springboot.minio;
 
 import io.micronaut.testresources.testcontainers.AbstractTestContainersProvider;
 import org.testcontainers.containers.GenericContainer;
diff --git a/springboot-testresources-minio/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver b/springboot-testresources-minio/src/main/resources/META-INF/services/io.micronaut.testresources.core.TestResourcesResolver
@@ -1 +1 @@
-io.cloudflight.testresources.springboot.MinioTestResourcesProvider
+io.cloudflight.testresources.springboot.minio.MinioTestResourcesProvider
diff --git a/springboot-testresources-minio/src/test/java/io/cloudflight/testresources/springboot/minio/MinioTestResourcesProviderTest.java b/springboot-testresources-minio/src/test/java/io/cloudflight/testresources/springboot/minio/MinioTestResourcesProviderTest.java
@@ -1,5 +1,6 @@
-package io.cloudflight.testresources.springboot;
+package io.cloudflight.testresources.springboot.minio;
 
+import io.cloudflight.testresources.springboot.minio.MinioTestResourcesProvider;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
diff --git a/testprojects/build.gradle.kts b/testprojects/build.gradle.kts
@@ -0,0 +1,7 @@
+subprojects {
+    if (this.subprojects.isEmpty()) {
+        dependencies {
+            "implementation"(platform("org.springframework.boot:spring-boot-dependencies:3.0.1"))
+        }
+    }
+}
diff --git a/testprojects/jdbc/mariadb/build.gradle.kts b/testprojects/jdbc/mariadb/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("io.micronaut.test-resources")
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    runtimeOnly("org.jetbrains.kotlin:kotlin-reflect")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+
+    runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
+
+    testRuntimeOnly(project(":springboot-testresources-client"))
+    testResourcesImplementation(project(":springboot-testresources-jdbc-mariadb"))
+}
diff --git a/testprojects/jdbc/mariadb/src/main/kotlin/io/cloudflight/testresources/springboot/jdbc/mariadb/Application.kt b/testprojects/jdbc/mariadb/src/main/kotlin/io/cloudflight/testresources/springboot/jdbc/mariadb/Application.kt
@@ -0,0 +1,20 @@
+package io.cloudflight.testresources.springboot.jdbc.mariadb
+
+import jakarta.persistence.Entity
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.Id
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.data.jpa.repository.JpaRepository
+
+@SpringBootApplication
+class Application
+
+@Entity
+class Person(var name: String) {
+
+    @Id
+    @GeneratedValue
+    var id: Long = 0
+}
+
+interface PersonRepository : JpaRepository<Person, Long>
diff --git a/testprojects/jdbc/mariadb/src/main/resources/application.yml b/testprojects/jdbc/mariadb/src/main/resources/application.yml
@@ -0,0 +1,9 @@
+spring:
+  jpa:
+    hibernate:
+      ddl-auto: create-drop
+
+test-resources:
+  containers:
+    mariadb:
+      image-name: mariadb:10.3
diff --git a/testprojects/jdbc/mariadb/src/test/kotlin/io/cloudflight/testresources/springboot/jdbc/mariadb/ApplicationTest.kt b/testprojects/jdbc/mariadb/src/test/kotlin/io/cloudflight/testresources/springboot/jdbc/mariadb/ApplicationTest.kt
@@ -0,0 +1,16 @@
+package io.cloudflight.testresources.springboot.jdbc.mariadb
+
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class ApplicationTest(
+    @Autowired private val repository: PersonRepository
+) {
+
+    @Test
+    fun enterData() {
+        repository.save(Person(name = "Person1"))
+    }
+}
diff --git a/testprojects/minio/build.gradle.kts b/testprojects/minio/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    id("io.micronaut.test-resources")
+}
+
+dependencies {
+    implementation("org.springframework.boot:spring-boot-starter-web")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+
+    testRuntimeOnly(project(":springboot-testresources-client"))
+    testResourcesImplementation(project(":springboot-testresources-minio"))
+}
diff --git a/testprojects/minio/src/main/kotlin/io/cloudflight/testresources/springboot/minio/Application.kt b/testprojects/minio/src/main/kotlin/io/cloudflight/testresources/springboot/minio/Application.kt
@@ -0,0 +1,14 @@
+package io.cloudflight.testresources.springboot.minio
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.stereotype.Service
+
+@SpringBootApplication
+class Application
+
+@Service
+class StorageService(@Value("\${minio.url}") val url: String) {
+
+
+}
diff --git a/testprojects/minio/src/main/resources/application.yml b/testprojects/minio/src/main/resources/application.yml
diff --git a/testprojects/minio/src/test/kotlin/io/cloudflight/testresources/springboot/minio/ApplicationTest.kt b/testprojects/minio/src/test/kotlin/io/cloudflight/testresources/springboot/minio/ApplicationTest.kt
@@ -0,0 +1,17 @@
+package io.cloudflight.testresources.springboot.minio
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest
+class ApplicationTest(
+    @Autowired private val storageService: StorageService
+) {
+
+    @Test
+    fun minioIsAlive() {
+        assertThat(storageService.url).isNotBlank
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`kotlin.code.style=official`
	`2`	`+`
	`3`	`+micronautVersion=3.6.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.cloudflight.testresources.springboot;`
	`1`	`+package io.cloudflight.testresources.springboot.jdbc.mariadb;`
`2`	`2`
`3`	`3`	`import io.micronaut.testresources.testcontainers.AbstractTestContainersProvider;`
`4`	`4`	`import org.testcontainers.containers.JdbcDatabaseContainer;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-io.cloudflight.testresources.springboot.MariaDbTestResourcesProvider`
	`1`	`+io.cloudflight.testresources.springboot.jdbc.mariadb.MariaDbTestResourcesProvider`