Skip to content

Commit f6214bc

Browse files
teetanghteetangh
committed
Refactor model class and update integration tests
1 parent 1e357fa commit f6214bc

File tree

4 files changed

+82
-32
lines changed

4 files changed

+82
-32
lines changed

‎src/main/java/org/couchbase/quickstart/springboot/models/Route.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import javax.validation.constraints.NotBlank;
77
import javax.validation.constraints.NotNull;
88

9-
import com.couchbase.client.core.deps.com.fasterxml.jackson.annotation.JsonAlias;
10-
import com.fasterxml.jackson.annotation.JsonProperty;
11-
129
import lombok.AllArgsConstructor;
1310
import lombok.Builder;
1411
import lombok.Data;
@@ -34,8 +31,6 @@ public class Route {
3431
private String airline;
3532

3633
@NotBlank(message = "Airline ID is mandatory")
37-
@JsonProperty("airlineid")
38-
@JsonAlias({"airline_id", "airlineId"})
3934
private String airlineid;
4035

4136
@NotBlank(message = "Source airport is mandatory")

‎src/test/java/org/couchbase/quickstart/springboot/controllers/AirlineIntegrationTest.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,34 @@ void testUpdateAirline() {
105105
Airline airline = Airline.builder()
106106
.id("airline_update")
107107
.type("airline")
108-
.name("Updated Test Airline")
108+
.name("Test Airline")
109109
.iata("TA")
110110
.icao("TST")
111111
.callsign("TEST")
112112
.country("United States")
113113
.build();
114114
restTemplate.postForEntity("/api/v1/airline/" + airline.getId(), airline,
115115
Airline.class);
116-
restTemplate.put("/api/v1/airline/" + airline.getId(), airline);
116+
117+
Airline updatedAirline = Airline.builder()
118+
.id("airline_update")
119+
.type("airline")
120+
.name("Updated Airline")
121+
.iata("Updated TA")
122+
.icao("Updated TST")
123+
.callsign("Updated TEST")
124+
.country("France")
125+
.build();
126+
restTemplate.put("/api/v1/airline/" + updatedAirline.getId(), updatedAirline);
127+
117128
ResponseEntity<Airline> response = restTemplate
118-
.getForEntity("/api/v1/airline/" + airline.getId(),
129+
.getForEntity("/api/v1/airline/" + updatedAirline.getId(),
119130
Airline.class);
120131

121132
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
122-
Airline updatedAirline = response.getBody();
123-
assertThat(updatedAirline)
124-
.isNotNull()
125-
.isEqualTo(airline);
133+
Airline retrievedAirline = response.getBody();
134+
assert retrievedAirline != null;
135+
assertThat(retrievedAirline).isEqualTo(updatedAirline);
126136
}
127137

128138
@Test

‎src/test/java/org/couchbase/quickstart/springboot/controllers/AirportIntegrationTest.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,20 +100,27 @@ void testCreateAirport() {
100100
@Test
101101
void testUpdateAirport() {
102102
Airport airport = Airport.builder().id("airport_update").type("airport")
103+
.airportname("Test Airport").city("Test City")
104+
.country("Test Country").faa("TST").icao("TEST")
105+
.tz("Test Timezone").geo(new Geo(1.0, 2.0, 3.0)).build();
106+
restTemplate.postForEntity("/api/v1/airport/" + airport.getId(), airport,
107+
Airport.class);
108+
109+
Airport updatedAirport = Airport.builder().id("airport_update").type("airport")
103110
.airportname("Updated Test Airport").city("Updated Test City")
104111
.country("Updated Test Country").faa("TST").icao("TEST")
105112
.tz("Updated Test Timezone").geo(new Geo(1.0, 2.0, 3.0)).build();
106-
restTemplate.postForEntity("/api/v1/airport/" + airport.getId(), airport,
113+
114+
restTemplate.put("/api/v1/airport/" + updatedAirport.getId(), updatedAirport);
115+
116+
ResponseEntity<Airport> response = restTemplate.getForEntity(
117+
"/api/v1/airport/" + updatedAirport.getId(),
107118
Airport.class);
108-
restTemplate.put("/api/v1/airport/" + airport.getId(), airport);
109-
ResponseEntity<Airport> response = restTemplate
110-
.getForEntity("/api/v1/airport/" + airport.getId(),
111-
Airport.class);
112119

113120
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
114-
Airport updatedAirport = response.getBody();
115-
assert updatedAirport != null;
116-
assertThat(updatedAirport).isEqualTo(airport);
121+
Airport createdAirport = response.getBody();
122+
assert createdAirport != null;
123+
assertThat(createdAirport).isEqualTo(updatedAirport);
117124
}
118125

119126
@Test

‎src/test/java/org/couchbase/quickstart/springboot/controllers/RouteIntegrationTest.java‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ void testUpdateRoute() throws Exception {
166166
Route route = Route.builder()
167167
.id("route_update")
168168
.type("route")
169-
.airline("AF")
170-
.airlineid("airline_137")
171-
.sourceairport("TLV")
172-
.destinationairport("MRS")
169+
.airline("airline")
170+
.airlineid("airlineid")
171+
.sourceairport("sourceairport")
172+
.destinationairport("destinationairport")
173173
.stops(0)
174174
.equipment("320")
175175
.schedule(Arrays.asList(
@@ -201,15 +201,53 @@ void testUpdateRoute() throws Exception {
201201

202202
restTemplate.postForEntity("/api/v1/route/" + route.getId(), route,
203203
Route.class);
204-
restTemplate.put("/api/v1/route/" + route.getId(), route);
205-
ResponseEntity<Route> response = restTemplate
206-
.getForEntity("/api/v1/route/" + route.getId(),
207-
Route.class);
204+
205+
Route updatedRoute = Route.builder().
206+
id("route_update")
207+
.type("route")
208+
.airline("updated_airline")
209+
.airlineid("updated_airlineid")
210+
.sourceairport("updated_sourceairport")
211+
.destinationairport("updated_destinationairport")
212+
.stops(0)
213+
.equipment("updated_320")
214+
.schedule(Arrays.asList(
215+
new Route.Schedule(0, "AF198", "10:13:00"),
216+
new Route.Schedule(0, "AF547", "19:14:00"),
217+
new Route.Schedule(0, "AF943", "01:31:00"),
218+
new Route.Schedule(1, "AF356", "12:40:00"),
219+
new Route.Schedule(1, "AF480", "08:58:00"),
220+
new Route.Schedule(1, "AF250", "12:59:00"),
221+
new Route.Schedule(1, "AF130", "04:45:00"),
222+
new Route.Schedule(2, "AF997", "00:31:00"),
223+
new Route.Schedule(2, "AF223", "19:41:00"),
224+
new Route.Schedule(2, "AF890", "15:14:00"),
225+
new Route.Schedule(2, "AF399", "00:30:00"),
226+
new Route.Schedule(2, "AF328", "16:18:00"),
227+
new Route.Schedule(3, "AF074", "23:50:00"),
228+
new Route.Schedule(3, "AF556", "11:33:00"),
229+
new Route.Schedule(4, "AF064", "13:23:00"),
230+
new Route.Schedule(4, "AF596", "12:09:00"),
231+
new Route.Schedule(4, "AF818", "08:02:00"),
232+
new Route.Schedule(5, "AF967", "11:33:00"),
233+
new Route.Schedule(5, "AF730", "19:42:00"),
234+
new Route.Schedule(6, "AF882", "17:07:00"),
235+
new Route.Schedule(6, "AF485", "17:03:00"),
236+
new Route.Schedule(6, "AF898", "10:01:00"),
237+
new Route.Schedule(6, "AF496", "07:00:00")))
238+
.distance(2881.617376098415)
239+
.build();
240+
241+
restTemplate.put("/api/v1/route/" + updatedRoute.getId(), updatedRoute);
242+
243+
ResponseEntity<Route> response = restTemplate.getForEntity(
244+
"/api/v1/route/" + updatedRoute.getId(),
245+
Route.class);
208246

209247
assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
210-
Route updatedRoute = response.getBody();
211-
assert updatedRoute != null;
212-
assertThat(updatedRoute).isEqualTo(route);
248+
Route createdRoute = response.getBody();
249+
assert createdRoute != null;
250+
assertThat(createdRoute).isEqualTo(updatedRoute);
213251
}
214252

215253
@Test
@@ -261,7 +299,7 @@ void testDeleteRoute() throws Exception {
261299

262300
@Test
263301
void testListRoutes() throws Exception {
264-
int limit = 10;
302+
int limit = 20;
265303
int offset = 0;
266304

267305
ResponseEntity<List<Route>> response = restTemplate.exchange(

0 commit comments

Comments
 (0)