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

DATAMONGO-2206 - Polishing.

Browse Source 
Reformat code. Convert spaces to tabs. Use mockk version property to define mockk version. Author tags.

Original pull request: #646.
This commit is contained in:
Mark Paluch
2019-02-20 11:32:45 +01:00
parent 02216d5941
commit f20a0f20c9
14 changed files with 79 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-mongodb/pom.xml
View File

@@ -279,12 +279,12 @@
<version>${kotlin}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.mockk</groupId>
<artifactId>mockk</artifactId>
<version>1.9.1</version>
<version>${mockk}</version>
<scope>test</scope>
</dependency>
</dependencies>

66
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
View File

@@ -26,51 +26,51 @@ import org.junit.Test
*/
class ExecutableFindOperationExtensionsTests {
val operation = mockk<ExecutableFindOperation>(relaxed = true)
val operation = mockk<ExecutableFindOperation>(relaxed = true)
val operationWithProjection = mockk<ExecutableFindOperation.FindWithProjection<First>>(relaxed = true)
val operationWithProjection = mockk<ExecutableFindOperation.FindWithProjection<First>>(relaxed = true)
val distinctWithProjection = mockk<ExecutableFindOperation.DistinctWithProjection>(relaxed = true)
val distinctWithProjection = mockk<ExecutableFindOperation.DistinctWithProjection>(relaxed = true)
@Test // DATAMONGO-1689
fun `ExecutableFindOperation#query(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `ExecutableFindOperation#query(KClass) extension should call its Java counterpart`() {
operation.query(First::class)
verify { operation.query(First::class.java) }
}
operation.query(First::class)
verify { operation.query(First::class.java) }
}
@Test // DATAMONGO-1689
fun `ExecutableFindOperation#query() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `ExecutableFindOperation#query() with reified type parameter extension should call its Java counterpart`() {
operation.query<First>()
verify { operation.query(First::class.java) }
}
operation.query<First>()
verify { operation.query(First::class.java) }
}
@Test // DATAMONGO-1689, DATAMONGO-2086
fun `ExecutableFindOperation#FindOperationWithProjection#asType(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1689, DATAMONGO-2086
fun `ExecutableFindOperation#FindOperationWithProjection#asType(KClass) extension should call its Java counterpart`() {
operationWithProjection.asType(User::class)
verify { operationWithProjection.`as`(User::class.java) }
}
operationWithProjection.asType(User::class)
verify { operationWithProjection.`as`(User::class.java) }
}
@Test // DATAMONGO-1689, DATAMONGO-2086
fun `ExecutableFindOperation#FindOperationWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-1689, DATAMONGO-2086
fun `ExecutableFindOperation#FindOperationWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
operationWithProjection.asType<User>()
verify { operationWithProjection.`as`(User::class.java) }
}
operationWithProjection.asType<User>()
verify { operationWithProjection.`as`(User::class.java) }
}
@Test // DATAMONGO-1761, DATAMONGO-2086
fun `ExecutableFindOperation#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1761, DATAMONGO-2086
fun `ExecutableFindOperation#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
distinctWithProjection.asType(User::class)
verify { distinctWithProjection.`as`(User::class.java) }
}
distinctWithProjection.asType(User::class)
verify { distinctWithProjection.`as`(User::class.java) }
}
@Test // DATAMONGO-2086
fun `ExecutableFindOperation#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-2086
fun `ExecutableFindOperation#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
distinctWithProjection.asType<User>()
verify { distinctWithProjection.`as`(User::class.java) }
}
distinctWithProjection.asType<User>()
verify { distinctWithProjection.`as`(User::class.java) }
}
}

22
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
View File

@@ -26,20 +26,20 @@ import org.junit.Test
*/
class ExecutableInsertOperationExtensionsTests {
val operation = mockk<ExecutableInsertOperation>(relaxed = true)
val operation = mockk<ExecutableInsertOperation>(relaxed = true)
@Test // DATAMONGO-1689
fun `insert(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `insert(KClass) extension should call its Java counterpart`() {
operation.insert(First::class)
verify { operation.insert(First::class.java) }
}
operation.insert(First::class)
verify { operation.insert(First::class.java) }
}
@Test // DATAMONGO-1689
fun `insert() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `insert() with reified type parameter extension should call its Java counterpart`() {
operation.insert<First>()
verify { operation.insert(First::class.java) }
}
operation.insert<First>()
verify { operation.insert(First::class.java) }
}
}

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
View File

@@ -22,6 +22,7 @@ import org.junit.Test
/**
* @author Christoph Strobl
* @author Sebastien Deleuze
*/
class ExecutableMapReduceOperationExtensionsTests {

22
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
View File

@@ -26,20 +26,20 @@ import org.junit.Test
*/
class ExecutableRemoveOperationExtensionsTests {
val operation = mockk<ExecutableRemoveOperation>(relaxed = true)
val operation = mockk<ExecutableRemoveOperation>(relaxed = true)
@Test // DATAMONGO-1689
fun `remove(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `remove(KClass) extension should call its Java counterpart`() {
operation.remove(First::class)
verify { operation.remove(First::class.java) }
}
operation.remove(First::class)
verify { operation.remove(First::class.java) }
}
@Test // DATAMONGO-1689
fun `remove() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-1689
fun `remove() with reified type parameter extension should call its Java counterpart`() {
operation.remove<First>()
verify { operation.remove(First::class.java) }
}
operation.remove<First>()
verify { operation.remove(First::class.java) }
}
}

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
View File

@@ -24,6 +24,7 @@ import org.junit.Test
* Unit tests for `ExecutableUpdateOperationExtensions.kt`.
*
* @author Christoph Strobl
* @author Sebastien Deleuze
*/
class ExecutableUpdateOperationExtensionsTests {

4
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
View File

@@ -147,7 +147,7 @@ class MongoOperationsExtensionsTests {
fun `indexOps() with reified type parameter extension should call its Java counterpart`() {
operations.indexOps<First>()
verify { operations .indexOps(First::class.java) }
verify { operations.indexOps(First::class.java) }
}
@Test // DATAMONGO-1689
@@ -716,7 +716,7 @@ class MongoOperationsExtensionsTests {
operations.findDistinct<String, First>(query, "field", "collection")
verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
}
@Test // DATAMONGO-1761
fun `findDistinct(Query, String, KClass) should call java counterpart`() {

23
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
View File

@@ -22,23 +22,24 @@ import org.junit.Test
/**
* @author Mark Paluch
* @author Sebastien Deleuze
*/
class ReactiveAggregationOperationExtensionsTests {
val operation = mockk<ReactiveAggregationOperation>(relaxed = true)
val operation = mockk<ReactiveAggregationOperation>(relaxed = true)
@Test // DATAMONGO-1719
fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
@Test // DATAMONGO-1719
fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
operation.aggregateAndReturn(First::class)
verify { operation.aggregateAndReturn(First::class.java) }
}
operation.aggregateAndReturn(First::class)
verify { operation.aggregateAndReturn(First::class.java) }
}
@Test // DATAMONGO-1719
fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
@Test // DATAMONGO-1719
fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
operation.aggregateAndReturn<First>()
verify { operation.aggregateAndReturn(First::class.java) }
}
operation.aggregateAndReturn<First>()
verify { operation.aggregateAndReturn(First::class.java) }
}
}

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
View File

@@ -22,6 +22,7 @@ import org.junit.Test
/**
* @author Mark Paluch
* @author Sebastien Deleuze
*/
class ReactiveFindOperationExtensionsTests {

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
View File

@@ -22,6 +22,7 @@ import org.junit.Test
/**
* @author Mark Paluch
* @author Sebastien Deleuze
*/
class ReactiveInsertOperationExtensionsTests {

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
View File

@@ -22,6 +22,7 @@ import org.junit.Test
/**
* @author Christoph Strobl
* @author Sebastien Deleuze
*/
class ReactiveMapReduceOperationExtensionsTests {

2
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
View File

@@ -566,7 +566,7 @@ class ReactiveMongoOperationsExtensionsTests {
verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
}
@Test // DATAMONGO-1761
fun `findDistinct(Query, String, KClass) should call java counterpart`() {

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
View File

@@ -22,6 +22,7 @@ import org.junit.Test
/**
* @author Mark Paluch
* @author Sebastien Deleuze
*/
class ReactiveRemoveOperationExtensionsTests {

1
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
View File

@@ -24,6 +24,7 @@ import org.junit.Test
* Unit tests for `ReactiveExecutableUpdateOperationExtensions.kt`.
*
* @author Mark Paluch
* @author Sebastien Deleuze
*/
class ReactiveUpdateOperationExtensionsTests {