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

#421 - Polishing.

Browse Source 
Simplify tests. Use ReflectionUtils.isVoid(…) where possible and simplify isVoid(…) flows.

Original pull request: #422.
This commit is contained in:
Mark Paluch
2020-07-31 11:39:34 +02:00
parent 748d6c3340
commit 2f9ca57ed5
3 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java
View File

@@ -17,8 +17,6 @@ package org.springframework.data.r2dbc.repository;
import static org.assertj.core.api.Assertions.*;
import kotlin.Unit;
import io.r2dbc.spi.ConnectionFactory;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -50,7 +48,7 @@ import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport;
import org.springframework.data.relational.core.mapping.Table;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.reactive.ReactiveSortingRepository;
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.reactive.TransactionalOperator;
@@ -58,7 +56,6 @@ import org.springframework.transaction.reactive.TransactionalOperator;
* Abstract base class for integration tests for {@link LegoSetRepository} using {@link R2dbcRepositoryFactory}.
*
* @author Mark Paluch
* @author Stephen Cohen
*/
public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcIntegrationTestSupport {
@@ -314,40 +311,6 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg
.verifyComplete();
}
@Test // gh-421
public void shouldDeleteAndReturnSuccess() {
shouldInsertNewItems();
repository.deleteByManualAndReturnSuccess(12) //
.as(StepVerifier::create) //
.expectNext(true) //
.verifyComplete();
repository.findAll() //
.map(LegoSet::getManual) //
.as(StepVerifier::create) //
.expectNext(13) //
.verifyComplete();
}
@Test // gh-421
public void shouldDeleteAndReturnKotlinUnit() {
shouldInsertNewItems();
repository.deleteByManualAndReturnKotlinUnit(12) //
.as(StepVerifier::create) //
.expectNext(Unit.INSTANCE) //
.verifyComplete();
repository.findAll() //
.map(LegoSet::getManual) //
.as(StepVerifier::create) //
.expectNext(13) //
.verifyComplete();
}
private Condition<? super Object> numberOf(int expected) {
return new Condition<>(it -> {
return it instanceof Number && ((Number) it).intValue() == expected;
@@ -355,7 +318,7 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg
}
@NoRepositoryBean
interface LegoSetRepository extends ReactiveSortingRepository<LegoSet, Integer> {
interface LegoSetRepository extends ReactiveCrudRepository<LegoSet, Integer> {
Flux<LegoSet> findByNameContains(String name);
@@ -381,14 +344,6 @@ public abstract class AbstractR2dbcRepositoryIntegrationTests extends R2dbcInteg
@Query("DELETE from legoset")
Mono<Integer> deleteAllAndReturnCount();
@Modifying
@Query("DELETE from legoset where manual = :manual")
Mono<Boolean> deleteByManualAndReturnSuccess(int manual);
@Modifying
@Query("DELETE from legoset where manual = :manual")
Mono<Unit> deleteByManualAndReturnKotlinUnit(int manual);
Mono<Integer> countByNameContains(String namePart);
}