From fb3a57352e9f3ffd1e24c99d2090c40dd03d095c Mon Sep 17 00:00:00 2001 From: Andrii Kovalenko Date: Thu, 19 Oct 2017 13:46:57 +0200 Subject: [PATCH] #175: fix PaidNotificationProcessorTest: exclude SetAmountPaid assertion --- .../common/PaidNotificationProcessorTest.java | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/service/src/test/java/com/commercetools/pspadapter/payone/notification/common/PaidNotificationProcessorTest.java b/service/src/test/java/com/commercetools/pspadapter/payone/notification/common/PaidNotificationProcessorTest.java index da7b7fe793..85fcd3aa16 100644 --- a/service/src/test/java/com/commercetools/pspadapter/payone/notification/common/PaidNotificationProcessorTest.java +++ b/service/src/test/java/com/commercetools/pspadapter/payone/notification/common/PaidNotificationProcessorTest.java @@ -81,21 +81,11 @@ public void processingCompletedNotificationAboutUnknownTransactionAddsChargeTran .build()); final AddInterfaceInteraction interfaceInteraction = getAddInterfaceInteraction(notification, timestamp); - - assertThat(updateActions).as("# of payment update actions").hasSize(5); - assertThat(updateActions).as("added transaction") - .filteredOn(u -> u.getAction().equals("addTransaction")) - .usingElementComparatorOnFields( - "transaction.type", "transaction.amount", "transaction.state", "transaction.timestamp") - .containsOnlyOnce(transaction); - - assertThat(updateActions).as("amount paid") - .filteredOn(u -> u.getAction().equals("setAmountPaid")) - .containsOnly(SetAmountPaid.of(MoneyImpl.of(notification.getPrice(), notification.getCurrency()))); final SetStatusInterfaceCode statusInterfaceCode = getSetStatusInterfaceCode(notification); final SetStatusInterfaceText statusInterfaceText = getSetStatusInterfaceText(notification); - assertStandardUpdateActions(updateActions, interfaceInteraction, statusInterfaceCode, statusInterfaceText); + assertThat(updateActions).as("added transactions") + .containsExactlyInAnyOrder(transaction, interfaceInteraction, statusInterfaceCode, statusInterfaceText); verifyUpdateOrderActions(payment, ORDER_PAYMENT_STATE); } @@ -145,16 +135,11 @@ private Payment processingCompletedNotificationForPendingChargeTransactionChange final SetStatusInterfaceCode statusInterfaceCode = getSetStatusInterfaceCode(notification); final SetStatusInterfaceText statusInterfaceText = getSetStatusInterfaceText(notification); - assertThat(updateActions).as("# of payment update actions").hasSize(5); - assertThat(updateActions).as("transaction state change") - .filteredOn(u -> u.getAction().equals("changeTransactionState")) - .containsOnly(ChangeTransactionState.of(TransactionState.SUCCESS, chargeTransaction.getId())); + assertThat(updateActions).as("payment update actions list") + .containsExactlyInAnyOrder( + ChangeTransactionState.of(TransactionState.SUCCESS, chargeTransaction.getId()), + interfaceInteraction, statusInterfaceCode, statusInterfaceText); - assertThat(updateActions).as("amount paid") - .filteredOn(u -> u.getAction().equals("setAmountPaid")) - .containsOnly(SetAmountPaid.of(MoneyImpl.of(notification.getPrice(), notification.getCurrency()))); - - assertStandardUpdateActions(updateActions, interfaceInteraction, statusInterfaceCode, statusInterfaceText); return payment; }