Skip to content

Commit ea17c12

Browse files
mp911demp911de
committed
Migrate Couchbase tests to JUnit 5.
Closes #664
1 parent 545d957 commit ea17c12

File tree

10 files changed

+334
-339
lines changed

10 files changed

+334
-339
lines changed

‎couchbase/example/src/test/java/example/springdata/couchbase/repository/AirlineRepositoryIntegrationTests.java‎

Lines changed: 73 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -17,94 +17,91 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20-
import example.springdata.couchbase.model.Airline;
21-
import example.springdata.couchbase.util.CouchbaseAvailableRule;
22-
2320
import java.util.List;
2421

25-
import org.junit.Before;
26-
import org.junit.ClassRule;
27-
import org.junit.Test;
28-
import org.junit.runner.RunWith;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
24+
2925
import org.springframework.beans.factory.annotation.Autowired;
3026
import org.springframework.boot.test.context.SpringBootTest;
3127
import org.springframework.data.couchbase.core.CouchbaseOperations;
32-
import org.springframework.test.context.junit4.SpringRunner;
28+
29+
import example.springdata.couchbase.model.Airline;
30+
import example.springdata.couchbase.util.EnabledOnCouchbaseAvailable;
3331

3432
/**
3533
* Integration tests showing basic CRUD operations through {@link AirlineRepository}.
3634
*
3735
* @author Denis Rosa
3836
*/
39-
@RunWith(SpringRunner.class)
4037
@SpringBootTest
38+
@EnabledOnCouchbaseAvailable
4139
public class AirlineRepositoryIntegrationTests {
4240

43-
@ClassRule //
44-
public static CouchbaseAvailableRule COUCHBASE = CouchbaseAvailableRule.onLocalhost();
45-
46-
@Autowired AirlineRepository airlineRepository;
47-
48-
@Autowired CouchbaseOperations couchbaseOperations;
49-
50-
@Before
51-
public void before() {
52-
if (couchbaseOperations.existsById().one("LH")) {
53-
couchbaseOperations.removeById().one("LH");
54-
}
55-
}
56-
57-
/**
58-
* The derived query executes a N1QL query emitting a single element.
59-
*/
60-
@Test
61-
public void shouldFindAirlineN1ql() {
62-
63-
List<Airline> airlines = airlineRepository.findByIata("TQ");
64-
assertThat(airlines.get(0).getCallsign()).isEqualTo("TXW");
65-
}
66-
67-
/**
68-
* The derived query executes a N1QL query and the emitted element is used to invoke
69-
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(Object)} for an Id-based
70-
* lookup. Queries without a result do not emit a value.
71-
*/
72-
@Test
73-
public void shouldFindById() {
74-
75-
Airline airline = airlineRepository.findByIata("TQ").get(0);
76-
assertThat(airlineRepository.findById(airline.getId()).isPresent());
77-
}
78-
79-
/**
80-
* Find all {@link Airline}s applying the {@code airlines/all} view.
81-
*/
82-
@Test
83-
public void shouldFindByView() {
84-
85-
List<Airline> airlines = airlineRepository.findAllBy();
86-
87-
assertThat(airlines).hasSizeGreaterThan(100);
88-
}
89-
90-
/**
91-
* Created elements are emitted by the
92-
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#save(Object)} method.
93-
*/
94-
@Test
95-
public void shouldCreateAirline() {
96-
97-
Airline airline = new Airline();
98-
99-
airline.setId("LH");
100-
airline.setIata("LH");
101-
airline.setIcao("DLH");
102-
airline.setCallsign("Lufthansa");
103-
airline.setName("Lufthansa");
104-
airline.setCountry("Germany");
105-
106-
airlineRepository.save(airline);
107-
108-
assertThat(airlineRepository.findById("LH")).contains(airline);
109-
}
41+
@Autowired
42+
AirlineRepository airlineRepository;
43+
44+
@Autowired
45+
CouchbaseOperations couchbaseOperations;
46+
47+
@BeforeEach
48+
public void before() {
49+
if (couchbaseOperations.existsById().one("LH")) {
50+
couchbaseOperations.removeById().one("LH");
51+
}
52+
}
53+
54+
/**
55+
* The derived query executes a N1QL query emitting a single element.
56+
*/
57+
@Test
58+
public void shouldFindAirlineN1ql() {
59+
60+
List<Airline> airlines = airlineRepository.findByIata("TQ");
61+
assertThat(airlines.get(0).getCallsign()).isEqualTo("TXW");
62+
}
63+
64+
/**
65+
* The derived query executes a N1QL query and the emitted element is used to invoke
66+
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(Object)} for an Id-based lookup.
67+
* Queries without a result do not emit a value.
68+
*/
69+
@Test
70+
public void shouldFindById() {
71+
72+
Airline airline = airlineRepository.findByIata("TQ").get(0);
73+
assertThat(airlineRepository.findById(airline.getId()).isPresent());
74+
}
75+
76+
/**
77+
* Find all {@link Airline}s applying the {@code airlines/all} view.
78+
*/
79+
@Test
80+
public void shouldFindByView() {
81+
82+
List<Airline> airlines = airlineRepository.findAllBy();
83+
84+
assertThat(airlines).hasSizeGreaterThan(100);
85+
}
86+
87+
/**
88+
* Created elements are emitted by the
89+
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#save(Object)} method.
90+
*/
91+
@Test
92+
public void shouldCreateAirline() {
93+
94+
Airline airline = new Airline();
95+
96+
airline.setId("LH");
97+
airline.setIata("LH");
98+
airline.setIcao("DLH");
99+
airline.setCallsign("Lufthansa");
100+
airline.setName("Lufthansa");
101+
airline.setCountry("Germany");
102+
103+
airlineRepository.save(airline);
104+
105+
assertThat(airlineRepository.findById("LH")).contains(airline);
106+
}
110107
}

‎couchbase/reactive/src/test/java/example/springdata/couchbase/repository/ReactiveAirlineRepositoryIntegrationTests.java‎

Lines changed: 91 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -17,111 +17,108 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20-
import example.springdata.couchbase.model.Airline;
21-
import example.springdata.couchbase.util.CouchbaseAvailableRule;
22-
import reactor.core.publisher.Mono;
23-
import reactor.test.StepVerifier;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2422

25-
import org.junit.Before;
26-
import org.junit.ClassRule;
27-
import org.junit.Test;
28-
import org.junit.runner.RunWith;
2923
import org.springframework.beans.factory.annotation.Autowired;
3024
import org.springframework.boot.test.context.SpringBootTest;
3125
import org.springframework.data.couchbase.core.CouchbaseOperations;
32-
import org.springframework.test.context.junit4.SpringRunner;
26+
27+
import example.springdata.couchbase.model.Airline;
28+
import example.springdata.couchbase.util.EnabledOnCouchbaseAvailable;
29+
import reactor.core.publisher.Mono;
30+
import reactor.test.StepVerifier;
3331

3432
/**
3533
* Integration tests showing basic CRUD operations through {@link ReactiveAirlineRepository}
3634
*
3735
* @author Mark Paluch
3836
*/
39-
@RunWith(SpringRunner.class)
4037
@SpringBootTest
38+
@EnabledOnCouchbaseAvailable
4139
public class ReactiveAirlineRepositoryIntegrationTests {
4240

43-
@ClassRule //
44-
public static CouchbaseAvailableRule COUCHBASE = CouchbaseAvailableRule.onLocalhost();
45-
46-
@Autowired ReactiveAirlineRepository airlineRepository;
47-
48-
@Autowired CouchbaseOperations couchbaseOperations;
49-
50-
@Before
51-
public void before() {
52-
if (couchbaseOperations.existsById().one("LH")) {
53-
couchbaseOperations.removeById().one("LH");
54-
}
55-
}
56-
57-
/**
58-
* The derived query executes a N1QL query emitting a single element.
59-
*/
60-
@Test
61-
public void shouldFindAirlineN1ql() {
62-
63-
airlineRepository.findByIata("TQ") //
64-
.as(StepVerifier::create) //
65-
.assertNext(it -> {
66-
assertThat(it.getCallsign()).isEqualTo("TXW");
67-
}).verifyComplete();
68-
}
69-
70-
/**
71-
* The derived query executes a N1QL query and the emitted element is used to invoke
72-
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(Object)} for an Id-based
73-
* lookup. Queries without a result do not emit a value.
74-
*/
75-
@Test
76-
public void shouldFindById() {
77-
78-
Mono<Airline> airline = airlineRepository.findByIata("TQ") //
79-
.map(Airline::getId) //
80-
.flatMap(airlineRepository::findById);
81-
82-
airline.as(StepVerifier::create) //
83-
.assertNext(it -> {
84-
85-
assertThat(it.getCallsign()).isEqualTo("TXW");
86-
}).verifyComplete();
87-
88-
}
89-
90-
/**
91-
* Find all {@link Airline}s applying the {@code airlines/all} view.
92-
*/
93-
@Test
94-
public void shouldFindAll() {
95-
airlineRepository.findAllBy().count() //
96-
.as(StepVerifier::create) //
97-
.assertNext(count -> {
98-
99-
assertThat(count).isGreaterThan(100);
100-
}).verifyComplete();
101-
}
102-
103-
/**
104-
* Created elements are emitted by the
105-
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#save(Object)} method.
106-
*/
107-
@Test
108-
public void shouldCreateAirline() {
109-
110-
Airline airline = new Airline();
111-
112-
airline.setId("LH");
113-
airline.setIata("LH");
114-
airline.setIcao("DLH");
115-
airline.setCallsign("Lufthansa");
116-
airline.setName("Lufthansa");
117-
airline.setCountry("Germany");
118-
119-
Mono<Airline> airlineMono = airlineRepository.save(airline) //
120-
.map(Airline::getId) //
121-
.flatMap(airlineRepository::findById);
122-
123-
airlineMono.as(StepVerifier::create) //
124-
.expectNext(airline) //
125-
.verifyComplete();
126-
}
41+
@Autowired
42+
ReactiveAirlineRepository airlineRepository;
43+
44+
@Autowired
45+
CouchbaseOperations couchbaseOperations;
46+
47+
@BeforeEach
48+
public void before() {
49+
if (couchbaseOperations.existsById().one("LH")) {
50+
couchbaseOperations.removeById().one("LH");
51+
}
52+
}
53+
54+
/**
55+
* The derived query executes a N1QL query emitting a single element.
56+
*/
57+
@Test
58+
public void shouldFindAirlineN1ql() {
59+
60+
airlineRepository.findByIata("TQ") //
61+
.as(StepVerifier::create) //
62+
.assertNext(it -> {
63+
assertThat(it.getCallsign()).isEqualTo("TXW");
64+
}).verifyComplete();
65+
}
66+
67+
/**
68+
* The derived query executes a N1QL query and the emitted element is used to invoke
69+
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(Object)} for an Id-based lookup.
70+
* Queries without a result do not emit a value.
71+
*/
72+
@Test
73+
public void shouldFindById() {
74+
75+
Mono<Airline> airline = airlineRepository.findByIata("TQ") //
76+
.map(Airline::getId) //
77+
.flatMap(airlineRepository::findById);
78+
79+
airline.as(StepVerifier::create) //
80+
.assertNext(it -> {
81+
82+
assertThat(it.getCallsign()).isEqualTo("TXW");
83+
}).verifyComplete();
84+
85+
}
86+
87+
/**
88+
* Find all {@link Airline}s applying the {@code airlines/all} view.
89+
*/
90+
@Test
91+
public void shouldFindAll() {
92+
airlineRepository.findAllBy().count() //
93+
.as(StepVerifier::create) //
94+
.assertNext(count -> {
95+
96+
assertThat(count).isGreaterThan(100);
97+
}).verifyComplete();
98+
}
99+
100+
/**
101+
* Created elements are emitted by the
102+
* {@link org.springframework.data.repository.reactive.ReactiveCrudRepository#save(Object)} method.
103+
*/
104+
@Test
105+
public void shouldCreateAirline() {
106+
107+
Airline airline = new Airline();
108+
109+
airline.setId("LH");
110+
airline.setIata("LH");
111+
airline.setIcao("DLH");
112+
airline.setCallsign("Lufthansa");
113+
airline.setName("Lufthansa");
114+
airline.setCountry("Germany");
115+
116+
Mono<Airline> airlineMono = airlineRepository.save(airline) //
117+
.map(Airline::getId) //
118+
.flatMap(airlineRepository::findById);
119+
120+
airlineMono.as(StepVerifier::create) //
121+
.expectNext(airline) //
122+
.verifyComplete();
123+
}
127124
}

0 commit comments

Comments
 (0)