Skip to content

Commit 85b0e59

Browse files
gcatanesegcatanese
authored
Improve test code and snippets (#1553)
1 parent b91ea7d commit 85b0e59

File tree

3 files changed

+91
-74
lines changed

3 files changed

+91
-74
lines changed

‎README.md‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,23 @@ Client client = new Client("Your X-API-KEY", Environment.TEST);
9696
PaymentsApi paymentsApi = new PaymentsApi(client);
9797

9898
// Create PaymentRequest
99-
PaymentRequest paymentRequest = new PaymentRequest();
100-
paymentRequest.setMerchantAccount("YOUR_MERCHANT_ACCOUNT");
101-
CardDetails cardDetails = new CardDetails();
102-
cardDetails.encryptedCardNumber("test_4111111111111111")
103-
.encryptedSecurityCode("test_737")
104-
.encryptedExpiryMonth("test_03")
105-
.encryptedExpiryYear("test_2030");
106-
paymentRequest.setPaymentMethod(new CheckoutPaymentMethod(cardDetails));
107-
Amount amount = new Amount().currency("EUR").value(1000L);
108-
paymentRequest.setAmount(amount);
109-
paymentRequest.setReference("Your order number");
110-
paymentRequest.setReturnUrl("https://your-company.com/checkout?shopperOrder=12xy..");
99+
CardDetails cardDetails =
100+
new CardDetails()
101+
.type(CardDetails.TypeEnum.SCHEME)
102+
.encryptedCardNumber("5136333333333335")
103+
.holderName("John Doe")
104+
.cvc("737")
105+
.encryptedExpiryMonth("08")
106+
.encryptedExpiryYear("2018");
107+
PaymentRequest paymentRequest =
108+
new PaymentRequest()
109+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
110+
.reference("YOUR_REFERENCE")
111+
.amount(new Amount()
112+
.currency("EUR")
113+
.value(1000L))
114+
.returnUrl("https://your-company.example.org/checkout?shopperOrder=12xy..")
115+
.paymentMethod(new CheckoutPaymentMethod(cardDetails));
111116

112117
// Make a call to the /payments endpoint
113118
PaymentResponse paymentResponse = paymentsApi.payments(paymentRequest);

‎src/test/java/com/adyen/CheckoutTest.java‎

Lines changed: 69 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,24 @@ public class CheckoutTest extends BaseTest {
4141
@Test
4242
public void TestPaymentSuccess() throws Exception {
4343
Client client = createMockClientFromFile("mocks/checkout/paymentResponse.json");
44-
Amount amount = new Amount().currency("EUR").value(1000L);
45-
CardDetails cardDetails = new CardDetails();
46-
cardDetails
47-
.encryptedCardNumber("5136333333333335")
48-
.holderName("John Doe")
49-
.cvc("737")
50-
.encryptedExpiryMonth("08")
51-
.encryptedExpiryYear("2018");
52-
cardDetails.setType(CardDetails.TypeEnum.SCHEME);
53-
PaymentRequest paymentRequest = new PaymentRequest();
54-
paymentRequest.setAmount(amount);
55-
paymentRequest.setPaymentMethod(new CheckoutPaymentMethod(cardDetails));
44+
CardDetails cardDetails =
45+
new CardDetails()
46+
.type(CardDetails.TypeEnum.SCHEME)
47+
.encryptedCardNumber("5136333333333335")
48+
.holderName("John Doe")
49+
.cvc("737")
50+
.encryptedExpiryMonth("08")
51+
.encryptedExpiryYear("2018");
52+
PaymentRequest paymentRequest =
53+
new PaymentRequest()
54+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
55+
.reference("YOUR_REFERENCE")
56+
.amount(new Amount()
57+
.currency("EUR")
58+
.value(1000L))
59+
.returnUrl("https://your-company.example.org/checkout?shopperOrder=12xy..")
60+
.paymentMethod(new CheckoutPaymentMethod(cardDetails));
61+
5662
PaymentsApi checkout = new PaymentsApi(client);
5763
PaymentResponse paymentResponse = checkout.payments(paymentRequest);
5864
assertEquals("993617895204576J", paymentResponse.getPspReference());
@@ -121,8 +127,9 @@ public void TestDeserializePaymentRequestScheme() throws Exception {
121127
@Test
122128
public void TestPaymentMethodsSuccess() throws Exception {
123129
Client client = createMockClientFromFile("mocks/checkout/paymentMethodsResponse.json");
124-
PaymentMethodsRequest paymentMethodsRequest = new PaymentMethodsRequest();
125-
paymentMethodsRequest.setMerchantAccount("myMerchantAccount");
130+
PaymentMethodsRequest paymentMethodsRequest = new PaymentMethodsRequest()
131+
.merchantAccount("myMerchantAccount");
132+
126133
PaymentsApi checkout = new PaymentsApi(client);
127134
PaymentMethodsResponse paymentMethodsResponse = checkout.paymentMethods(paymentMethodsRequest);
128135
assertEquals(1, paymentMethodsResponse.getPaymentMethods().size());
@@ -133,18 +140,15 @@ public void TestPaymentMethodsSuccess() throws Exception {
133140
@Test
134141
public void TestPaymentLinkSuccess() throws Exception {
135142
Client client = createMockClientFromFile("mocks/checkout/paymentLinkResponse.json");
136-
PaymentLinkRequest createPaymentLinkRequest = new PaymentLinkRequest();
137-
Amount amount = new Amount().currency("EUR").value(500L);
138-
createPaymentLinkRequest.setAmount(amount);
139-
createPaymentLinkRequest.setMerchantAccount("myMerchantAccount");
140-
createPaymentLinkRequest.setReference("merchantReference");
141-
LineItem lineItem = new LineItem();
142-
lineItem.setBrand("brand");
143-
lineItem.setColor("color");
144-
List<LineItem> lineItemList = new ArrayList<>();
145-
lineItemList.add(lineItem);
146-
createPaymentLinkRequest.setLineItems(lineItemList);
143+
PaymentLinkRequest createPaymentLinkRequest = new PaymentLinkRequest()
144+
.amount(new Amount().currency("EUR").value(500L))
145+
.merchantAccount("myMerchantAccount")
146+
.reference("merchantReference")
147+
.lineItems(Arrays.asList(new LineItem()
148+
.brand("brand")
149+
.color("color")));
147150
PaymentLinksApi checkout = new PaymentLinksApi(client);
151+
148152
PaymentLinkResponse paymentLinkResponse = checkout.paymentLinks(createPaymentLinkRequest);
149153
assertEquals("https://test.adyen.link/PL6DB3157D27FFBBCF", paymentLinkResponse.getUrl());
150154
assertEquals(PaymentLinkResponse.StatusEnum.ACTIVE, paymentLinkResponse.getStatus());
@@ -179,8 +183,8 @@ public void TestPatchPaymentLinkSuccess() throws Exception {
179183
@Test
180184
public void TestPaymentDetailsSuccess() throws Exception {
181185
Client client = createMockClientFromFile("mocks/checkout/paymentDetailsResponse.json");
182-
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest();
183-
detailsRequest.setPaymentData("STATE_DATA");
186+
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest()
187+
.paymentData("STATE_DATA");
184188
PaymentsApi checkout = new PaymentsApi(client);
185189
PaymentDetailsResponse paymentDetailsResponse = checkout.paymentsDetails(detailsRequest);
186190
assertEquals(
@@ -193,8 +197,8 @@ public void TestPaymentDetailsWithThreeDSRequestorChallengeInd() throws Exceptio
193197
Client client =
194198
createMockClientFromFile(
195199
"mocks/checkout/paymentDetailsResponseThreeDSRequestorChallengeInd.json");
196-
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest();
197-
detailsRequest.setPaymentData("STATE_DATA");
200+
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest()
201+
.paymentData("STATE_DATA");
198202
PaymentsApi checkout = new PaymentsApi(client);
199203

200204
PaymentDetailsResponse paymentDetailsResponse = checkout.paymentsDetails(detailsRequest);
@@ -210,8 +214,8 @@ public void TestPaymentDetailsWithThreeDSRequestorChallengeInd() throws Exceptio
210214
public void TestPaymentDetailsWithThreeDS2Action() throws Exception {
211215
Client client =
212216
createMockClientFromFile("mocks/checkout/paymentDetailsResponseThreeDS2Action.json");
213-
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest();
214-
detailsRequest.setPaymentData("STATE_DATA");
217+
PaymentDetailsRequest detailsRequest = new PaymentDetailsRequest()
218+
.paymentData("STATE_DATA");
215219
PaymentsApi checkout = new PaymentsApi(client);
216220
PaymentDetailsResponse paymentDetailsResponse = checkout.paymentsDetails(detailsRequest);
217221
assertEquals(
@@ -230,15 +234,16 @@ public void TestPaymentDetailsWithThreeDS2Action() throws Exception {
230234
@Test
231235
public void TestCreateSessionsSuccessCall() throws Exception {
232236
Client client = createMockClientFromFile("mocks/checkout/createSessionsResponse.json");
233-
CreateCheckoutSessionRequest sessionRequest = new CreateCheckoutSessionRequest();
234-
sessionRequest.setReturnUrl("https://your-company.com/checkout?shopperOrder=12xy..");
235-
sessionRequest.setCountryCode("NL");
236-
sessionRequest.setReference("YOUR_PAYMENT_REFERENCE");
237-
sessionRequest.setMerchantAccount("YOUR_MERCHANT_ACCOUNT");
238-
Amount amount = new Amount().currency("EUR").value(100L);
239-
sessionRequest.setAmount(amount);
237+
CreateCheckoutSessionRequest sessionRequest = new CreateCheckoutSessionRequest()
238+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
239+
.amount(new Amount().currency("EUR").value(1000L))
240+
.reference("YOUR_PAYMENT_REFERENCE")
241+
.returnUrl("https://your-company.com/checkout?shopperOrder=12xy..")
242+
.countryCode("NL");
243+
240244
PaymentsApi checkout = new PaymentsApi(client);
241245
CreateCheckoutSessionResponse createCheckoutSessionResponse = checkout.sessions(sessionRequest);
246+
242247
assertEquals(
243248
"Ab02b4c0!BFHSPFBQTEwM0NBNTM3RfCf5", createCheckoutSessionResponse.getSessionData());
244249
assertEquals("CS1453E3730C313478", createCheckoutSessionResponse.getId());
@@ -253,11 +258,11 @@ public void TestCreateSessionsSuccessCall() throws Exception {
253258
@Test
254259
public void TestCreateOrderSuccessCall() throws Exception {
255260
Client client = createMockClientFromFile("mocks/checkout/createOrderResponse.json");
256-
CreateOrderRequest checkoutCreateOrderRequest = new CreateOrderRequest();
257-
Amount amount = new Amount().currency("EUR").value(2500L);
258-
checkoutCreateOrderRequest.setAmount(amount);
259-
checkoutCreateOrderRequest.setReference("YOUR_ORDER_REFERENCE");
260-
checkoutCreateOrderRequest.setMerchantAccount("YOUR_MERCHANT_ACOUNT");
261+
CreateOrderRequest checkoutCreateOrderRequest = new CreateOrderRequest()
262+
.amount(new Amount().currency("EUR").value(1000L))
263+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
264+
.reference("YOUR_ORDER_REFERENCE");
265+
261266
OrdersApi checkout = new OrdersApi(client);
262267
CreateOrderResponse checkoutCreateOrderResponse = checkout.orders(checkoutCreateOrderRequest);
263268
assertEquals("8616178914061985", checkoutCreateOrderResponse.getPspReference());
@@ -267,13 +272,13 @@ public void TestCreateOrderSuccessCall() throws Exception {
267272
@Test
268273
public void TestCancelOrderSuccessCall() throws Exception {
269274
Client client = createMockClientFromFile("mocks/checkout/cancelOrderResponse.json");
270-
CancelOrderRequest checkoutCancelOrderRequest = new CancelOrderRequest();
271-
checkoutCancelOrderRequest.setMerchantAccount("YOUR_MERCHANT_ACCOUNT");
272-
EncryptedOrderData encryptedOrderData = new EncryptedOrderData();
273-
encryptedOrderData.setPspReference("8815517812932012");
274-
encryptedOrderData.setOrderData("823fh892f8f18f4...148f13f9f3f");
275-
checkoutCancelOrderRequest.setOrder(encryptedOrderData);
275+
CancelOrderRequest checkoutCancelOrderRequest = new CancelOrderRequest()
276+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
277+
.order(new EncryptedOrderData()
278+
.pspReference("8815517812932012")
279+
.orderData("823fh892f8f18f4...148f13f9f3f"));
276280
OrdersApi checkout = new OrdersApi(client);
281+
277282
CancelOrderResponse checkoutCancelOrderResponse =
278283
checkout.cancelOrder(checkoutCancelOrderRequest);
279284
assertEquals(
@@ -285,10 +290,11 @@ public void TestCancelOrderSuccessCall() throws Exception {
285290
@Test
286291
public void TestApplePaySessionsSuccessCall() throws Exception {
287292
Client client = createMockClientFromFile("mocks/checkout/applePaySessionsResponse.json");
288-
ApplePaySessionRequest createApplePaySessionRequest = new ApplePaySessionRequest();
289-
createApplePaySessionRequest.setDisplayName("YOUR_MERCHANT_NAME");
290-
createApplePaySessionRequest.setDomainName("YOUR_DOMAIN_NAME");
291-
createApplePaySessionRequest.setMerchantIdentifier("YOUR_MERCHANT_ID");
293+
ApplePaySessionRequest createApplePaySessionRequest = new ApplePaySessionRequest()
294+
.displayName("YOUR_MERCHANT_NAME")
295+
.domainName("YOUR_MERCHANT_DOMAIN")
296+
.merchantIdentifier("YOUR_MERCHANT_ID");
297+
292298
UtilityApi checkout = new UtilityApi(client);
293299
ApplePaySessionResponse applePaySessionResponse =
294300
checkout.getApplePaySession(createApplePaySessionRequest);
@@ -299,17 +305,18 @@ public void TestApplePaySessionsSuccessCall() throws Exception {
299305
@Test
300306
public void TestDonationsSuccessCall() throws Exception {
301307
Client client = createMockClientFromFile("mocks/checkout/donationResponse.json");
302-
DonationPaymentRequest paymentDonationRequest = new DonationPaymentRequest();
303-
Amount amount = new Amount().currency("EUR").value(1000L);
304-
paymentDonationRequest.setAmount(amount);
305-
paymentDonationRequest.setDonationAccount("YOUR_DONATION_ACCOUNT");
306-
paymentDonationRequest.setMerchantAccount("YOUR_MERCHANT_ACCOUNT");
307-
CardDonations cardDetails = new CardDonations().type(CardDonations.TypeEnum.SCHEME);
308-
paymentDonationRequest.paymentMethod(new DonationPaymentMethod(cardDetails));
309-
paymentDonationRequest.setReference("YOUR_MERCHANT_REFERENCE");
310-
paymentDonationRequest.setReturnUrl("https://your-company.com/...");
308+
DonationPaymentRequest paymentDonationRequest = new DonationPaymentRequest()
309+
.donationAccount("YOUR_DONATION_ACCOUNT")
310+
.merchantAccount("YOUR_MERCHANT_ACCOUNT")
311+
.reference("YOUR_MERCHANT_REFERENCE")
312+
.returnUrl("https://your-company.com/checkout?shopperOrder=12xy..")
313+
.countryCode("NL")
314+
.amount(new Amount().currency("EUR").value(1000L))
315+
.paymentMethod(new DonationPaymentMethod(new CardDonations().type(CardDonations.TypeEnum.SCHEME)));
316+
311317
DonationsApi donationsApi = new DonationsApi(client);
312318
DonationPaymentResponse donationResponse = donationsApi.donations(paymentDonationRequest);
319+
313320
assertEquals(
314321
PaymentResponse.ResultCodeEnum.AUTHORISED, donationResponse.getPayment().getResultCode());
315322
assertEquals("UNIQUE_RESOURCE_ID", donationResponse.getId());

‎src/test/java/com/adyen/ErrorHandlingTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.adyen;
22

33
import com.adyen.enums.Environment;
4+
import com.adyen.model.ApiError;
45
import com.adyen.model.management.CreateAllowedOriginRequest;
56
import com.adyen.service.checkout.PaymentLinksApi;
67
import com.adyen.service.exception.ApiException;
@@ -36,6 +37,10 @@ public void CheckoutErrorTest() throws IOException, ApiException {
3637
service.getPaymentLink("1234");
3738
} catch (ApiException e) {
3839
Assert.assertTrue(e.getResponseBody().contains("Invalid payment link ID"));
40+
ApiError apiError = e.getError();
41+
Assert.assertEquals("Validation", apiError.getErrorType());
42+
Assert.assertEquals("Invalid payment link ID", apiError.getMessage());
43+
3944
}
4045
}
4146
}

0 commit comments

Comments
 (0)