Skip to content

Commit c9fbe6b

Browse files
tsolakouatsolakoua
committed
fix spacing in integration tests and style issue
1 parent 9b019ad commit c9fbe6b

28 files changed

+219
-223
lines changed

‎src/test/java/com/amadeus/AmadeusTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ public class AmadeusTest {
4949
@Test
5050
public void testBuilderWithInvalidEnvironment() {
5151

52-
//Given
52+
// Given
5353
Map<String,String> environment = new HashMap<>(); //System.getenv();
5454
environment.put("AMADEUS_CLIENT_ID", "MY_CLIENT_ID");
5555
environment.put("AMADEUS_CLIENT_SECRET", "MY_CLIENT_SECRET");
5656

57-
//When
57+
// When
5858
boolean result = Amadeus.builder(environment).build() instanceof Amadeus;
5959

60-
//Then
60+
// Then
6161
assertTrue(result, "should return a Configuration");
6262
}
6363

‎src/test/java/com/amadeus/HTTPClientThreadSafeIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void setup() {
3939
wireMockServer = new WireMockServer(8080);
4040
wireMockServer.start();
4141

42-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
42+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
4343
String address = "/v1/security/oauth2/token"
4444
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
4545
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -121,7 +121,7 @@ public void run() {
121121
public void givenClienWhenCallInParallelMultipleTimesThenThreadSafety()
122122
throws InterruptedException {
123123

124-
//Given
124+
// Given
125125

126126
//Alternative 1
127127
String address = "/v1/color?id=blue";
@@ -139,8 +139,8 @@ public void givenClienWhenCallInParallelMultipleTimesThenThreadSafety()
139139

140140
ExecutorService service = Executors.newFixedThreadPool(2);
141141

142-
//When
143-
//Then
142+
// When
143+
// Then
144144
AtomicInteger counter = new AtomicInteger(0);
145145
for (int i = 1; i < 10_000; i++) {
146146
List<Task> taskList = new ArrayList<>();
@@ -168,7 +168,7 @@ public void givenClienWhenCallInParallelMultipleTimesThenThreadSafety()
168168
public void givenClientWhenCallInParallelMultipleTimesThenThreadSafety2()
169169
throws InterruptedException {
170170

171-
//Given
171+
// Given
172172

173173
//Alternative 1
174174
String address = "/v1/color?id=blue";

‎src/test/java/com/amadeus/airline/DestinationsIT.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.jupiter.api.BeforeEach;
2020
import org.junit.jupiter.api.Test;
2121

22-
// https://developers.amadeus.com/self-service/category/air/api-doc/airline-routes/api-reference
22+
// API at https://developers.amadeus.com/self-service/category/air/api-doc/airline-routes/api-reference
2323
public class DestinationsIT {
2424
WireMockServer wireMockServer;
2525

@@ -33,7 +33,7 @@ public void setup() {
3333
wireMockServer = new WireMockServer(8080);
3434
wireMockServer.start();
3535

36-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
36+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
3737
String address = "/v1/security/oauth2/token"
3838
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
3939
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -59,28 +59,28 @@ public void teardown() {
5959
public void givenClientWhenCallAirlineDestinationsWithMandatoryParamsThenOk()
6060
throws ResponseException {
6161

62-
//Given
62+
// Given
6363
String address = "/v1/airline/destinations"
6464
+ "?airlineCode=BA";
6565
wireMockServer.stubFor(get(urlEqualTo(address))
6666
.willReturn(aResponse().withHeader("Content-Type", "application/json")
6767
.withStatus(200)
6868
.withBodyFile("airline_routes_response_ok.json")));
6969

70-
//When
70+
// When
7171
Destination[] result = amadeus.airline.destinations.get(
7272
Params.with("airlineCode", "BA")
7373
);
7474

75-
//Then
75+
// Then
7676
assertNotEquals(0, result.length);
7777
}
7878

7979
@Test
8080
public void givenClientWhenCallAirlineDestinationsWithOptionalParamsThenOK()
8181
throws ResponseException {
8282

83-
//Given
83+
// Given
8484
String address = "/v1/airline/destinations"
8585
+ "?max=2"
8686
+ "&airlineCode=BA";
@@ -89,29 +89,29 @@ public void givenClientWhenCallAirlineDestinationsWithOptionalParamsThenOK()
8989
.withStatus(200)
9090
.withBodyFile("airline_routes_response_ok2.json")));
9191

92-
//When
92+
// When
9393
Destination[] result = amadeus.airline.destinations.get(
9494
Params.with("airlineCode", "BA")
9595
.and("max", 2)
9696
);
9797

98-
//Then
98+
// Then
9999
assertEquals(2, result.length);
100100
}
101101

102102
//TODO Review with the team to upgrade the behaviour.
103103
@Test
104104
public void givenClientWhenCallAirlineDestinationsWithoutParamsThenOK() {
105105

106-
//Given
106+
// Given
107107
String address = "/v1/airline/destinations";
108108
wireMockServer.stubFor(get(urlEqualTo(address))
109109
.willReturn(aResponse().withHeader("Content-Type", "application/json")
110110
.withStatus(400)
111111
.withBody("")));
112112

113-
//When
114-
//Then
113+
// When
114+
// Then
115115
assertThatThrownBy(() -> {
116116
amadeus.airline.destinations.get();
117117
}).isInstanceOf(ClientException.class);

‎src/test/java/com/amadeus/booking/FlightOrdersIT.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void setup() {
4141
wireMockServer = new WireMockServer(8080);
4242
wireMockServer.start();
4343

44-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
44+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
4545
String address = "/v1/security/oauth2/token"
4646
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
4747
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -67,7 +67,7 @@ public void teardown() {
6767
public void givenClientWhenCallFlightOffersWithParamsThenOK()
6868
throws ResponseException, IOException {
6969

70-
//Given
70+
// Given
7171
String address = "/v2/shopping/flight-offers"; //"/v1/shopping/flight-offers/pricing"; //
7272
wireMockServer.stubFor(post(urlEqualTo(address))
7373
.willReturn(aResponse().withHeader("Content-Type", "application/json")
@@ -96,10 +96,10 @@ public void givenClientWhenCallFlightOffersWithParamsThenOK()
9696
FlightPrice flightPricing = amadeus.shopping.flightOffersSearch.pricing.post(
9797
flightOffersSearches[1]);
9898

99-
//When
99+
// When
100100
FlightOrder result = amadeus.booking.flightOrders.post(flightPricing, travelerArray);
101101

102-
//Then
102+
// Then
103103
assertNotNull(result);
104104
}
105105

@@ -138,7 +138,7 @@ private Traveler[] getTravelerData() {
138138
public void givenClientWhenCallFlightOffersWithParamsAlternative2ThenOK()
139139
throws ResponseException, IOException {
140140

141-
//Given
141+
// Given
142142
String address = "/v2/shopping/flight-offers"; //"/v1/shopping/flight-offers/pricing"; //
143143
wireMockServer.stubFor(post(urlEqualTo(address))
144144
.willReturn(aResponse().withHeader("Content-Type", "application/json")
@@ -157,18 +157,18 @@ public void givenClientWhenCallFlightOffersWithParamsAlternative2ThenOK()
157157

158158
FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.post(request);
159159

160-
//When
160+
// When
161161
FlightOrder result = amadeus.booking.flightOrders.post(flightOffersSearches, travellers);
162162

163-
//Then
163+
// Then
164164
assertNotNull(result);
165165
}
166166

167167
@Test
168168
public void givenClientWhenCallFlightOffersWithParamsAlternative3ThenOK()
169169
throws ResponseException, IOException {
170170

171-
//Given
171+
// Given
172172
String address = "/v2/shopping/flight-offers"; //"/v1/shopping/flight-offers/pricing"; //
173173
wireMockServer.stubFor(post(urlEqualTo(address))
174174
.willReturn(aResponse().withHeader("Content-Type", "application/json")
@@ -187,18 +187,18 @@ public void givenClientWhenCallFlightOffersWithParamsAlternative3ThenOK()
187187

188188
FlightOfferSearch[] flightOffersSearches = amadeus.shopping.flightOffersSearch.post(request);
189189

190-
//When
190+
// When
191191
FlightOrder result = amadeus.booking.flightOrders.post(flightOffersSearches[0], travellers);
192192

193-
//Then
193+
// Then
194194
assertNotNull(result);
195195
}
196196

197197
@Test
198198
public void givenClientWhenCallFlightOffersWithParamsAlternative4ThenOK()
199199
throws ResponseException, IOException {
200200

201-
//Given
201+
// Given
202202
String address = "/v1/booking/flight-orders";
203203
wireMockServer.stubFor(post(urlEqualTo(address))
204204
.willReturn(aResponse().withHeader("Content-Type", "application/json")
@@ -207,10 +207,10 @@ public void givenClientWhenCallFlightOffersWithParamsAlternative4ThenOK()
207207

208208
JsonObject request = getRequestFromResources("flight_create_order_request.json");
209209

210-
//When
210+
// When
211211
FlightOrder result = amadeus.booking.flightOrders.post(request);
212212

213-
//Then
213+
// Then
214214
assertNotNull(result);
215215
}
216216

‎src/test/java/com/amadeus/dutyOfCare/diseases/Covid19ReportIT.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.junit.jupiter.api.BeforeEach;
1919
import org.junit.jupiter.api.Test;
2020

21-
// https://developers.amadeus.com/self-service/category/covid-19-and-travel-safety/api-doc/travel-restrictions/api-reference
21+
// API at https://developers.amadeus.com/self-service/category/covid-19-and-travel-safety/api-doc/travel-restrictions/api-reference
2222
public class Covid19ReportIT {
2323
WireMockServer wireMockServer;
2424

@@ -32,7 +32,7 @@ public void setup() {
3232
wireMockServer = new WireMockServer(8080);
3333
wireMockServer.start();
3434

35-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
35+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
3636
String address = "/v1/security/oauth2/token"
3737
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
3838
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -58,36 +58,36 @@ public void teardown() {
5858
public void givenClientWhenCallTravelRestrictionsV2WithParamsThenOK()
5959
throws ResponseException {
6060

61-
//Given
61+
// Given
6262
String address = "/v2/duty-of-care/diseases/covid19-area-report"
6363
+ "?countryCode=US&cityCode=NYC&language=EN";
6464
wireMockServer.stubFor(get(urlEqualTo(address))
6565
.willReturn(aResponse().withHeader("Content-Type", "application/json")
6666
.withStatus(200)
6767
.withBodyFile("travel_restrictions_v2_response_ok.json")));
6868

69-
//When
69+
// When
7070
DiseaseReport result = amadeus.dutyOfCare.diseases.covid19Report.get(
7171
Params.with("countryCode", "US").and("cityCode", "NYC").and("language", "EN")
7272
);
7373

74-
//Then
74+
// Then
7575
assertNotNull(result);
7676
}
7777

7878
//TODO Review with the team to upgrade the behaviour.
7979
@Test
8080
public void givenClientWhenCallTravelRestrictionsV2WithoutParamsThenOK() {
8181

82-
//Given
82+
// Given
8383
String address = "/v2/duty-of-care/diseases/covid19-area-report";
8484
wireMockServer.stubFor(get(urlEqualTo(address))
8585
.willReturn(aResponse().withHeader("Content-Type", "application/json")
8686
.withStatus(400)
8787
.withBody("")));
8888

89-
//When
90-
//Then
89+
// When
90+
// Then
9191
assertThatThrownBy(() -> {
9292
amadeus.dutyOfCare.diseases.covid19Report.get();
9393
}).isInstanceOf(ClientException.class);

‎src/test/java/com/amadeus/ordering/TransferOrdersIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.jupiter.api.BeforeEach;
2020
import org.junit.jupiter.api.Test;
2121

22-
// https://developers.amadeus.com/self-service/category/cars-and-transfers/api-doc/transfer-booking
22+
// API at https://developers.amadeus.com/self-service/category/cars-and-transfers/api-doc/transfer-booking
2323
public class TransferOrdersIT {
2424

2525
WireMockServer wireMockServer;
@@ -34,7 +34,7 @@ public void setup() {
3434
wireMockServer = new WireMockServer(8080);
3535
wireMockServer.start();
3636

37-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
37+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
3838
String address = "/v1/security/oauth2/token"
3939
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
4040
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -60,7 +60,7 @@ public void teardown() {
6060
public void givenClientWhenCallTransferOrdersWithParamsThenOK()
6161
throws ResponseException, IOException {
6262

63-
//Given
63+
// Given
6464
String address = "/v1/ordering/transfer-orders" + "?offerId=123456";
6565
wireMockServer.stubFor(post(urlEqualTo(address))
6666
.willReturn(aResponse().withHeader("Content-Type", "application/json")
@@ -70,10 +70,10 @@ public void givenClientWhenCallTransferOrdersWithParamsThenOK()
7070
JsonObject request = getRequestFromResources("transfer_orders_request_ok.json");
7171
Params params = Params.with("offerId", "123456");
7272

73-
//When
73+
// When
7474
TransferOrder result = amadeus.ordering.transferOrders.post(request, params);
7575

76-
//Then
76+
// Then
7777
assertNotNull(result);
7878
}
7979

‎src/test/java/com/amadeus/ordering/transferOrders/transfers/CancellationIT.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@
1010
import com.amadeus.exceptions.ResponseException;
1111
import com.amadeus.resources.TransferCancellation;
1212
import com.github.tomakehurst.wiremock.WireMockServer;
13-
import com.google.gson.JsonObject;
14-
import com.google.gson.JsonParser;
15-
import java.io.File;
1613
import java.io.IOException;
17-
import java.nio.file.Files;
1814
import org.junit.jupiter.api.AfterEach;
1915
import org.junit.jupiter.api.BeforeEach;
2016
import org.junit.jupiter.api.Test;
2117

22-
// https://developers.amadeus.com/self-service/category/cars-and-transfers/api-doc/transfer-management
18+
// API at https://developers.amadeus.com/self-service/category/cars-and-transfers/api-doc/transfer-management
2319
public class CancellationIT {
2420

2521
WireMockServer wireMockServer;
@@ -34,7 +30,7 @@ public void setup() {
3430
wireMockServer = new WireMockServer(8080);
3531
wireMockServer.start();
3632

37-
// https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
33+
// API at https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
3834
String address = "/v1/security/oauth2/token"
3935
+ "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
4036
wireMockServer.stubFor(post(urlEqualTo(address))
@@ -60,21 +56,21 @@ public void teardown() {
6056
public void givenClientWhenCallTransferOrdersWithParamsThenOK()
6157
throws ResponseException, IOException {
6258

63-
//Given
64-
String address = "/v1/ordering/transfer-orders/123456/transfers/cancellation" +
65-
"?confirmNmb=12029761";
59+
// Given
60+
String address = "/v1/ordering/transfer-orders/123456/transfers/cancellation"
61+
+ "?confirmNmb=12029761";
6662
wireMockServer.stubFor(post(urlEqualTo(address))
6763
.willReturn(aResponse().withHeader("Content-Type", "application/json")
6864
.withStatus(200)
6965
.withBodyFile("transfer_orders_management_response_ok.json")));
7066
Params params = Params.with("confirmNmb", "12029761");
7167

72-
//When
68+
// When
7369
TransferCancellation result = amadeus.ordering
7470
.transferOrder("123456").transfers.cancellation.post(params);
7571

76-
//Then
72+
// Then
7773
assertNotNull(result);
7874
}
7975

80-
}
76+
}

0 commit comments

Comments
 (0)