- solution for the ordered tests issue

- disabled DemoApplicationTests

Author: antonarhipov

README.md

@@ -1,5 +1,18 @@
-# Spring Time in Kotlin, Episode 4: Testing with JUnit
+# Spring Time in Kotlin, Episode 5: Integration testing with TestContainers
 
-This is a demo project used in [the 4th episode of Spring Time in Kotlin series](https://www.youtube.com/watch?v=0jWo3o7r-W4) at the official [Kotlin YouTube channel](https://www.youtube.com/kotlin)
+This is a demo project used in [the 5th episode of Spring Time in Kotlin series](https://www.youtube.com/watch?v=0jWo3o7r-W4) at the official [Kotlin YouTube channel](https://www.youtube.com/kotlin)
 
-Lean how to use JUnit with Kotlin. Implement a few integration tests for a Spring app and add some web layer tests with MockMVC with MockK and SpringMockK.
+In this episode:
+- We start using PostgreSQL database instead of H2
+- Use TestContainers for testing
+- Lean more about Kotlin and Java interoperability
+
+##Running the application
+
+First, start PostgreSQL database by running this command (assuming you have Docker installed on the machine):
+
+    docker run -e POSTGRES_PASSWORD=password -e POSTGRES_USER=sa -p 5432:5432 -d postgres
+
+Now you can launch Spring Boot application:
+
+    ./gradlew bootRun

requests.http

@@ -19,7 +19,7 @@ POST http://localhost:8080
 Content-Type: application/json
 
 {
-  "text": "Privet!"
+  "text": "Privet2!"
 }
 
 ### get all the messages

src/main/resources/application.properties

@@ -1,7 +1,6 @@
-#spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:h2:file:./data/testdb
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
 spring.datasource.username=sa
 spring.datasource.password=password
-spring.datasource.schema=classpath:sql/schema.sql
+spring.datasource.schema=classpath:sql/schema.ddl
 spring.datasource.initialization-mode=always

src/main/resources/sql/schema.ddl

@@ -1,5 +1,7 @@
-CREATE TABLE messages (
-    id VARCHAR(100) UNIQUE NOT NULL,
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+
+CREATE TABLE IF NOT EXISTS messages (
+    id varchar(50) DEFAULT uuid_generate_v4()::text,
     text VARCHAR(500),
     CONSTRAINT id_messages PRIMARY KEY (id)
 );

src/test/kotlin/demo/DemoApplicationTests.kt

@@ -2,6 +2,7 @@ package demo
 
 import demo.kx.uuid
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -18,6 +19,7 @@ import kotlin.random.Random
         "spring.datasource.url=jdbc:h2:mem:testdb"
     ]
 )
+@Disabled
 class DemoApplicationTests(@Autowired val client: TestRestTemplate) {
 
     @Test

src/test/kotlin/demo/IntegrationTests.kt

@@ -11,7 +11,7 @@ class IntegrationTests {
     @Container
     var container = postgres("postgres:13-alpine") {
 //        withExposedPorts(6379)
-        withInitScript("schema.ddl")
+        withInitScript("sql/schema.ddl")
         withDatabaseName("db")
         withUsername("user")
         withPassword("password")

src/test/kotlin/demo/SpringBootIntegrationTests.kt

@@ -1,30 +1,29 @@
 package demo
 
-import demo.kx.uuid
 import org.assertj.core.api.Assertions
-import org.junit.jupiter.api.MethodOrderer
-import org.junit.jupiter.api.Order
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestMethodOrder
+import org.junit.jupiter.api.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.boot.test.web.client.getForEntity
 import org.springframework.boot.test.web.client.getForObject
 import org.springframework.boot.test.web.client.postForObject
 import org.springframework.http.HttpStatus
+import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.test.context.DynamicPropertyRegistry
 import org.springframework.test.context.DynamicPropertySource
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
-import kotlin.random.Random
 
 @Testcontainers
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 )
 @TestMethodOrder(MethodOrderer.OrderAnnotation::class)
-class SpringBootIntegrationTests(@Autowired val client: TestRestTemplate) {
+class SpringBootIntegrationTests(
+    @Autowired val client: TestRestTemplate,
+    @Autowired val jdbc: JdbcTemplate,
+) {
     companion object {
         @Container
         val container = postgres("postgres:13-alpine") {
@@ -43,17 +42,21 @@ class SpringBootIntegrationTests(@Autowired val client: TestRestTemplate) {
         }
     }
 
+    @AfterEach
+    fun cleanup() {
+        jdbc.execute("truncate table messages")
+    }
+
     @Test
     @Order(1)
     fun `test hello endpoint`() {
-        println(">>>>>>>>>>>>> Asserting Hello endpoint! >>>>>>>>>>>>>>>>>>>>>>>>> ")
         val entity = client.getForEntity<String>("/hello")
         Assertions.assertThat(entity.statusCode).isEqualTo(HttpStatus.OK)
         Assertions.assertThat(entity.body).contains("Hello")
     }
 
-    //TODO: remove
-    val id = "e3b7f959-f5c2-3d07-86e3-cd9df75e0b83"//"${Random.nextInt()}".uuid()
+    //TODO: this is just to demonstrate the issue with the database re-use between tests
+    val id = "this is wrong!!!!"//"${Random.nextInt()}".uuid()
 
     @Test
     @Order(2)