Browse Source

DATAMONGO-2206 - Polishing.

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

Original pull request: #646.
pull/666/head
Mark Paluch 7 years ago
parent
commit
f20a0f20c9
  1. 4
      spring-data-mongodb/pom.xml
  2. 66
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
  3. 22
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
  4. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
  5. 22
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
  6. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
  7. 4
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
  8. 23
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
  9. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
  10. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
  11. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
  12. 2
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
  13. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
  14. 1
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt

4
spring-data-mongodb/pom.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save