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

DATACMNS-1483 - Migrate Kotlin tests to Mockk.

Browse Source 
Original pull request: #338.
This commit is contained in:
Sebastien Deleuze
2019-02-19 11:23:01 +01:00
committed by Mark Paluch
parent d024a3ea12
commit 925b0a1f75
4 changed files with 64 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pom.xml
View File

@@ -270,24 +270,10 @@
</dependency>
<dependency>
<groupId>com.nhaarman</groupId>
<artifactId>mockito-kotlin</artifactId>
<version>1.5.0</version>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<version>1.9.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Scala -->

67
src/test/kotlin/org/springframework/data/convert/KotlinClassGeneratingEntityInstantiatorUnitTests.kt
View File

@@ -15,14 +15,10 @@
*/
package org.springframework.data.convert
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.whenever
import io.mockk.every
import io.mockk.mockk
import org.assertj.core.api.Assertions
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.junit.MockitoJUnitRunner
import org.springframework.data.annotation.PersistenceConstructor
import org.springframework.data.mapping.PersistentEntity
import org.springframework.data.mapping.context.SamplePersistentProperty
@@ -35,23 +31,23 @@ import java.lang.IllegalArgumentException
* Unit tests for [KotlinClassGeneratingEntityInstantiator] creating instances using Kotlin data classes.
*
* @author Mark Paluch
* @author Sebastien Deleuze
*/
@RunWith(MockitoJUnitRunner::class)
@Suppress("UNCHECKED_CAST")
class KotlinClassGeneratingEntityInstantiatorUnitTests {
@Mock lateinit var entity: PersistentEntity<*, *>
@Mock lateinit var provider: ParameterValueProvider<SamplePersistentProperty>
val provider = mockk<ParameterValueProvider<SamplePersistentProperty>>()
@Test // DATACMNS-1126
fun `should create instance`() {
val entity = this.entity as PersistentEntity<Contact, SamplePersistentProperty>
val entity = mockk<PersistentEntity<Contact, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<Contact, SamplePersistentProperty>(Contact::class.java)
doReturn("Walter", "White").`when`(provider).getParameterValue<SamplePersistentProperty>(any())
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
every { provider.getParameterValue<String>(any()) }.returnsMany("Walter", "White")
every { entity.persistenceConstructor } returns constructor
every { entity.type } returns constructor.constructor.declaringClass
every { entity.typeInformation } returns mockk()
val instance: Contact = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
@@ -62,15 +58,18 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
@Test // DATACMNS-1126
fun `should create instance and fill in defaults`() {
val entity = this.entity as PersistentEntity<ContactWithDefaulting, SamplePersistentProperty>
val entity = mockk<PersistentEntity<ContactWithDefaulting, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<ContactWithDefaulting, SamplePersistentProperty>(ContactWithDefaulting::class.java)
doReturn("Walter", null, "Skyler", null, null, null, null, null, null, null, /* 0-9 */
every { provider.getParameterValue<String>(any()) }.returnsMany(
"Walter", null, "Skyler", null, null, null, null, null, null, null, /* 0-9 */
null, null, null, null, null, null, null, null, null, null, /* 10-19 */
null, null, null, null, null, null, null, null, null, null, /* 20-29 */
null, "Walter", null, "Junior", null).`when`(provider).getParameterValue<SamplePersistentProperty>(any())
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
null, "Walter", null, "Junior", null)
every { entity.persistenceConstructor } returns constructor
every { entity.type } returns constructor.constructor.declaringClass
every { entity.typeInformation } returns mockk()
val instance: ContactWithDefaulting = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
@@ -85,11 +84,13 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
@Test // DATACMNS-1200
fun `absent primitive value should cause MappingInstantiationException`() {
val entity = this.entity as PersistentEntity<WithBoolean, SamplePersistentProperty>
val entity = mockk<PersistentEntity<WithBoolean, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<WithBoolean, SamplePersistentProperty>(WithBoolean::class.java)
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
every { provider.getParameterValue<Boolean>(any()) } returns null
every { entity.persistenceConstructor } returns constructor
every { entity.type } returns constructor.constructor.declaringClass
every { entity.typeInformation } returns mockk()
Assertions.assertThatThrownBy { KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider) } //
.isInstanceOf(MappingInstantiationException::class.java) //
@@ -100,11 +101,20 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
@Test // DATACMNS-1200
fun `should apply primitive defaulting for absent parameters`() {
val entity = this.entity as PersistentEntity<WithPrimitiveDefaulting, SamplePersistentProperty>
val entity = mockk<PersistentEntity<WithPrimitiveDefaulting, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<WithPrimitiveDefaulting, SamplePersistentProperty>(WithPrimitiveDefaulting::class.java)
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
every { provider.getParameterValue<Byte>(any()) } returns null
every { provider.getParameterValue<Short>(any()) } returns null
every { provider.getParameterValue<Int>(any()) } returns null
every { provider.getParameterValue<Long>(any()) } returns null
every { provider.getParameterValue<Float>(any()) } returns null
every { provider.getParameterValue<Double>(any()) } returns null
every { provider.getParameterValue<Char>(any()) } returns null
every { provider.getParameterValue<Boolean>(any()) } returns null
every { entity.persistenceConstructor } returns constructor
every { entity.type } returns constructor.constructor.declaringClass
every { entity.typeInformation } returns mockk()
val instance: WithPrimitiveDefaulting = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)
@@ -121,12 +131,13 @@ class KotlinClassGeneratingEntityInstantiatorUnitTests {
@Test // DATACMNS-1338
fun `should create instance using @PersistenceConstructor`() {
val entity = this.entity as PersistentEntity<CustomUser, SamplePersistentProperty>
val entity = mockk<PersistentEntity<CustomUser, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<CustomUser, SamplePersistentProperty>(CustomUser::class.java)
doReturn("Walter").`when`(provider).getParameterValue<SamplePersistentProperty>(any())
doReturn(constructor).whenever(entity).persistenceConstructor
doReturn(constructor.constructor.declaringClass).whenever(entity).type
every { provider.getParameterValue<String>(any()) } returns "Walter"
every { entity.persistenceConstructor } returns constructor
every { entity.type } returns constructor.constructor.declaringClass
every { entity.typeInformation } returns mockk()
val instance: CustomUser = KotlinClassGeneratingEntityInstantiator().createInstance(entity, provider)

25
src/test/kotlin/org/springframework/data/convert/ReflectionEntityInstantiatorDataClassUnitTests.kt
View File

@@ -15,14 +15,10 @@
*/
package org.springframework.data.convert
import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.doReturn
import com.nhaarman.mockito_kotlin.whenever
import io.mockk.every
import io.mockk.mockk
import org.assertj.core.api.Assertions
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.junit.MockitoJUnitRunner
import org.springframework.data.mapping.PersistentEntity
import org.springframework.data.mapping.context.SamplePersistentProperty
import org.springframework.data.mapping.model.ParameterValueProvider
@@ -32,22 +28,21 @@ import org.springframework.data.mapping.model.PreferredConstructorDiscoverer
* Unit tests for [ReflectionEntityInstantiator] creating instances using Kotlin data classes.
*
* @author Mark Paluch
* @author Sebastien Deleuze
*/
@RunWith(MockitoJUnitRunner::class)
@Suppress("UNCHECKED_CAST")
class ReflectionEntityInstantiatorDataClassUnitTests {
@Mock lateinit var entity: PersistentEntity<*, *>
@Mock lateinit var provider: ParameterValueProvider<SamplePersistentProperty>
val provider = mockk<ParameterValueProvider<SamplePersistentProperty>>()
@Test // DATACMNS-1126
fun `should create instance`() {
val entity = this.entity as PersistentEntity<Contact, SamplePersistentProperty>
val entity = mockk<PersistentEntity<Contact, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<Contact, SamplePersistentProperty>(Contact::class.java)
doReturn("Walter", "White").`when`(provider).getParameterValue<SamplePersistentProperty>(any())
doReturn(constructor).whenever(entity).persistenceConstructor
every { provider.getParameterValue<String>(any()) }.returnsMany("Walter", "White")
every { entity.persistenceConstructor } returns constructor
val instance: Contact = ReflectionEntityInstantiator.INSTANCE.createInstance(entity, provider)
@@ -58,11 +53,11 @@ class ReflectionEntityInstantiatorDataClassUnitTests {
@Test // DATACMNS-1126
fun `should create instance and fill in defaults`() {
val entity = this.entity as PersistentEntity<ContactWithDefaulting, SamplePersistentProperty>
val entity = mockk<PersistentEntity<ContactWithDefaulting, SamplePersistentProperty>>()
val constructor = PreferredConstructorDiscoverer.discover<ContactWithDefaulting, SamplePersistentProperty>(ContactWithDefaulting::class.java)
doReturn("Walter", null).`when`(provider).getParameterValue<SamplePersistentProperty>(any())
doReturn(constructor).whenever(entity).persistenceConstructor
every { provider.getParameterValue<String>(any()) }.returnsMany("Walter", null)
every { entity.persistenceConstructor } returns constructor
val instance: ContactWithDefaulting = ReflectionEntityInstantiator.INSTANCE.createInstance(entity, provider)

22
src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt
View File

@@ -15,28 +15,30 @@
*/
package org.springframework.data.repository
import com.nhaarman.mockito_kotlin.verify
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Answers
import org.mockito.Mock
import org.mockito.junit.MockitoJUnitRunner
import org.springframework.data.repository.sample.User
import java.util.*
import kotlin.test.assertNull
/**
* Unit tests for CrudRepositoryExtensions.
*
* @author Sebastien Deleuze
*/
@RunWith(MockitoJUnitRunner::class)
class CrudRepositoryExtensionsTests {
@Mock(answer = Answers.RETURNS_MOCKS)
lateinit var repository: CrudRepository<User, String>
var repository = mockk<CrudRepository<User, String>>()
@Test // DATACMNS-1346
fun `CrudRepository#findByIdOrNull() extension should call its Java counterpart`() {
repository.findByIdOrNull("foo")
verify(repository).findById("foo")
val user = User()
every { repository.findById("foo") }.returnsMany(Optional.of(user), Optional.empty())
assertEquals(user, repository.findByIdOrNull("foo"))
assertNull(repository.findByIdOrNull("foo"))
verify(exactly = 2) { repository.findById("foo") }
}
}