Skip to content

Commit

Permalink
#77 fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@syjer
syjer committed Jul 7, 2016
1 parent e0856d8 commit abb27c4
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/test/java/alfio/controller/ReservationFlowIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void reservationFlowTest() throws Exception{


// check that the payment page is shown
String reservationPage = reservationController.showPaymentPage(eventName, reservationIdentifier, new BindingAwareModelMap(), Locale.ENGLISH);
String reservationPage = reservationController.showPaymentPage(eventName, reservationIdentifier, null, null, null, null, new BindingAwareModelMap(), Locale.ENGLISH);
Assert.assertEquals("/event/reservation-page", reservationPage);
//

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/alfio/manager/PaymentManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@ public class PaymentManagerTest {{

describe("success flow", it -> {
it.should("return a successful payment result", expect -> {
expect.that(new PaymentManager(successStripe, transactionRepository).processPayment("", "", 100, event, "", "", ""))
expect.that(new PaymentManager(successStripe, null, transactionRepository).processPayment("", "", 100, event, "", "", ""))
.is(PaymentResult.successful(paymentId));
});
});

describe("stripe error", it -> {
it.should("return an unsuccessful payment result", expect -> {
expect.that(new PaymentManager(failureStripe, transactionRepository).processPayment("", "", 100, event, "", "", ""))
expect.that(new PaymentManager(failureStripe, null, transactionRepository).processPayment("", "", 100, event, "", "", ""))
.is(PaymentResult.unsuccessful(error));
});
});

describe("internal error", it -> {
it.should("throw IllegalStateException in case of internal error", expect -> {
expect.exception(IllegalStateException.class, () -> {
new PaymentManager(successStripe, failureTR).processPayment("", "", 100, event, "", "", "");
new PaymentManager(successStripe, null, failureTR).processPayment("", "", 100, event, "", "", "");
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/alfio/manager/TicketReservationManagerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void testTicketSelection() {

assertEquals(0, ticketReservationManager.getPendingPayments(event).size());

PaymentResult confirm = ticketReservationManager.confirm(null, event.getEvent(), reservationId, "[email protected]", "full name", Locale.ENGLISH, "billing address",
PaymentResult confirm = ticketReservationManager.confirm(null, null, event.getEvent(), reservationId, "[email protected]", "full name", Locale.ENGLISH, "billing address",
totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false);


Expand All @@ -172,7 +172,7 @@ public void testTicketSelection() {
TicketReservationWithOptionalCodeModification modForDelete = new TicketReservationWithOptionalCodeModification(trForDelete, Optional.<SpecialPrice>empty());
String reservationId2 = ticketReservationManager.createTicketReservation(event.getId(), Collections.singletonList(modForDelete), Collections.emptyList(), DateUtils.addDays(new Date(), 1), Optional.<String>empty(), Optional.<String>empty(), Locale.ENGLISH, false);

ticketReservationManager.confirm(null, event.getEvent(), reservationId2, "[email protected]", "full name", Locale.ENGLISH, "billing address",
ticketReservationManager.confirm(null, null, event.getEvent(), reservationId2, "[email protected]", "full name", Locale.ENGLISH, "billing address",
totalPrice, Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false);

assertTrue(ticketReservationManager.findById(reservationId2).isPresent());
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/alfio/manager/TicketReservationManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ public class TicketReservationManagerTest {{
when(ticketRepository.updateTicketsStatusWithReservationId(eq(reservationId), eq(TicketStatus.ACQUIRED.toString()))).thenReturn(1);
when(ticketReservationRepository.updateTicketReservation(eq(reservationId), eq(IN_PAYMENT.toString()), anyString(), anyString(), anyString(), anyString(), isNull(ZonedDateTime.class), eq(PaymentProxy.STRIPE.toString()))).thenReturn(1);
when(paymentManager.processPayment(eq(reservationId), eq(gatewayToken), anyInt(), eq(event), anyString(), anyString(), anyString())).thenReturn(PaymentResult.successful(transactionId));
PaymentResult result = ticketReservationManager.confirm(gatewayToken, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), false);
PaymentResult result = ticketReservationManager.confirm(gatewayToken, null, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), false);
expect.that(result.isSuccessful()).is(true);
expect.that(result.getGatewayTransactionId()).is(Optional.of(transactionId));
verify(ticketReservationRepository).updateTicketReservation(eq(reservationId), eq(TicketReservationStatus.IN_PAYMENT.toString()), anyString(), anyString(), anyString(), anyString(), any(), eq(PaymentProxy.STRIPE.toString()));
Expand All @@ -586,7 +586,7 @@ public class TicketReservationManagerTest {{
when(ticketReservationRepository.updateTicketReservation(eq(reservationId), eq(IN_PAYMENT.toString()), anyString(), anyString(), anyString(), anyString(), isNull(ZonedDateTime.class), eq(PaymentProxy.STRIPE.toString()))).thenReturn(1);
when(ticketReservationRepository.updateTicketStatus(eq(reservationId), eq(TicketReservationStatus.PENDING.toString()))).thenReturn(1);
when(paymentManager.processPayment(eq(reservationId), eq(gatewayToken), anyInt(), eq(event), anyString(), anyString(), anyString())).thenReturn(PaymentResult.unsuccessful("error-code"));
PaymentResult result = ticketReservationManager.confirm(gatewayToken, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), false);
PaymentResult result = ticketReservationManager.confirm(gatewayToken, null, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.STRIPE), false);
expect.that(result.isSuccessful()).is(false);
expect.that(result.getGatewayTransactionId()).is(Optional.empty());
expect.that(result.getErrorCode()).is(Optional.of("error-code"));
Expand All @@ -599,7 +599,7 @@ public class TicketReservationManagerTest {{
when(ticketRepository.updateTicketsStatusWithReservationId(eq(reservationId), eq(TicketStatus.TO_BE_PAID.toString()))).thenReturn(1);
when(ticketReservationRepository.updateTicketReservation(eq(reservationId), eq(COMPLETE.toString()), anyString(), anyString(), anyString(), anyString(), any(ZonedDateTime.class), eq(PaymentProxy.ON_SITE.toString()))).thenReturn(1);
when(paymentManager.processPayment(eq(reservationId), eq(gatewayToken), anyInt(), eq(event), anyString(), anyString(), anyString())).thenReturn(PaymentResult.unsuccessful("error-code"));
PaymentResult result = ticketReservationManager.confirm(gatewayToken, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false);
PaymentResult result = ticketReservationManager.confirm(gatewayToken, null, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false);
expect.that(result.isSuccessful()).is(true);
expect.that(result.getGatewayTransactionId()).is(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID));
verify(ticketReservationRepository).updateTicketReservation(eq(reservationId), eq(TicketReservationStatus.COMPLETE.toString()), anyString(), anyString(), anyString(), anyString(), any(), eq(PaymentProxy.ON_SITE.toString()));
Expand All @@ -611,7 +611,7 @@ public class TicketReservationManagerTest {{

it.should("handle the OFFLINE payment method", expect -> {
when(ticketReservationRepository.postponePayment(eq(reservationId), any(Date.class), anyString(), anyString(), anyString())).thenReturn(1);
PaymentResult result = ticketReservationManager.confirm(gatewayToken, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false);
PaymentResult result = ticketReservationManager.confirm(gatewayToken, null, event, reservationId, "", "", Locale.ENGLISH, "", new TicketReservationManager.TotalPrice(100, 0, 0, 0), Optional.empty(), Optional.of(PaymentProxy.OFFLINE), false);
expect.that(result.isSuccessful()).is(true);
expect.that(result.getGatewayTransactionId()).is(Optional.of(TicketReservationManager.NOT_YET_PAID_TRANSACTION_ID));
verify(waitingQueueManager, never()).fireReservationConfirmed(eq(reservationId));
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/alfio/manager/system/DataMigratorIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ public void testUpdateGender() {
TicketReservationWithOptionalCodeModification r = new TicketReservationWithOptionalCodeModification(trm, Optional.empty());
Date expiration = DateUtils.addDays(new Date(), 1);
String reservationId = ticketReservationManager.createTicketReservation(event.getId(), Collections.singletonList(r), Collections.emptyList(), expiration, Optional.empty(), Optional.empty(), Locale.ENGLISH, false);
ticketReservationManager.confirm("TOKEN", event, reservationId, "[email protected]", "full name", Locale.ENGLISH, null, new TicketReservationManager.TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false);
ticketReservationManager.confirm("TOKEN", null, event, reservationId, "[email protected]", "full name", Locale.ENGLISH, null, new TicketReservationManager.TotalPrice(1000, 10, 0, 0), Optional.empty(), Optional.of(PaymentProxy.ON_SITE), false);
List<Ticket> tickets = ticketRepository.findTicketsInReservation(reservationId);
UpdateTicketOwnerForm first = new UpdateTicketOwnerForm();
first.setEmail("[email protected]");
Expand Down

0 comments on commit abb27c4

Please sign in to comment.