Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Move Testcontainer creation into utility.

See #632
This commit is contained in:
Mark Paluch
2021-10-14 14:47:54 +02:00
committed by Greg L. Turnquist
parent e53d9b5643
commit a73d74a76d
53 changed files with 284 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mongodb/kotlin/pom.xml
View File

@@ -39,14 +39,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
<version>${testcontainers.version}</version>
<groupId>org.springframework.data.examples</groupId>
<artifactId>spring-data-mongodb-example-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

6
mongodb/kotlin/src/test/kotlin/example/springdata/mongodb/people/FlowAndCoroutinesTests.kt
View File

@@ -15,6 +15,7 @@
*/
package example.springdata.mongodb.people
import example.springdata.mongodb.util.MongoContainers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.reactive.asFlow
@@ -31,10 +32,8 @@ import org.springframework.data.mongodb.core.query.Query
import org.springframework.data.mongodb.core.query.isEqualTo
import org.springframework.test.context.DynamicPropertyRegistry
import org.springframework.test.context.DynamicPropertySource
import org.testcontainers.containers.MongoDBContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.utility.DockerImageName
import reactor.test.StepVerifier
/**
@@ -48,8 +47,7 @@ class FlowAndCoroutinesTests {
companion object {
@Container //
private val mongoDBContainer = MongoDBContainer(
DockerImageName.parse("mongo:5.0"))
private val mongoDBContainer = MongoContainers.getDefaultContainer()
@JvmStatic
@DynamicPropertySource

9
mongodb/kotlin/src/test/kotlin/example/springdata/mongodb/people/MongoDslTests.kt
View File

@@ -15,13 +15,12 @@
*/
package example.springdata.mongodb.people;
import example.springdata.mongodb.util.MongoContainers
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.junit.runner.RunWith
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.data.mongodb.core.MongoOperations
import org.springframework.data.mongodb.core.dropCollection
import org.springframework.data.mongodb.core.find
@@ -32,11 +31,8 @@ import org.springframework.data.mongodb.core.query.isEqualTo
import org.springframework.data.mongodb.core.query.regex
import org.springframework.test.context.DynamicPropertyRegistry
import org.springframework.test.context.DynamicPropertySource
import org.springframework.test.context.junit4.SpringRunner
import org.testcontainers.containers.MongoDBContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.utility.DockerImageName
/**
* Tests showing the Mongo Criteria DSL.
@@ -49,8 +45,7 @@ class MongoDslTests {
companion object {
@Container //
private val mongoDBContainer = MongoDBContainer(
DockerImageName.parse("mongo:5.0"))
private val mongoDBContainer = MongoContainers.getDefaultContainer()
@JvmStatic
@DynamicPropertySource

6
mongodb/kotlin/src/test/kotlin/example/springdata/mongodb/people/RepositoryTests.kt
View File

@@ -15,6 +15,7 @@
*/
package example.springdata.mongodb.people
import example.springdata.mongodb.util.MongoContainers
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.jupiter.api.BeforeEach
@@ -24,10 +25,8 @@ import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest
import org.springframework.dao.EmptyResultDataAccessException
import org.springframework.test.context.DynamicPropertyRegistry
import org.springframework.test.context.DynamicPropertySource
import org.testcontainers.containers.MongoDBContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.utility.DockerImageName
/**
* Tests showing Kotlin usage of Spring Data Repositories.
@@ -40,8 +39,7 @@ class RepositoryTests {
companion object {
@Container //
private val mongoDBContainer = MongoDBContainer(
DockerImageName.parse("mongo:5.0"))
private val mongoDBContainer = MongoContainers.getDefaultContainer()
@JvmStatic
@DynamicPropertySource

6
mongodb/kotlin/src/test/kotlin/example/springdata/mongodb/people/TemplateTests.kt
View File

@@ -15,6 +15,7 @@
*/
package example.springdata.mongodb.people
import example.springdata.mongodb.util.MongoContainers
import org.assertj.core.api.Assertions.assertThat
import org.bson.Document
import org.junit.jupiter.api.BeforeEach
@@ -27,10 +28,8 @@ import org.springframework.data.mongodb.core.query.Query.query
import org.springframework.data.mongodb.core.query.isEqualTo
import org.springframework.test.context.DynamicPropertyRegistry
import org.springframework.test.context.DynamicPropertySource
import org.testcontainers.containers.MongoDBContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.utility.DockerImageName
/**
* Tests showing Kotlin usage of [MongoTemplate] and its Kotlin extensions.
@@ -43,8 +42,7 @@ class TemplateTests {
companion object {
@Container //
private val mongoDBContainer = MongoDBContainer(
DockerImageName.parse("mongo:5.0"))
private val mongoDBContainer = MongoContainers.getDefaultContainer()
@JvmStatic
@DynamicPropertySource