killbill-memoizeit

Fix processedAmount in MockPaymentProviderPlugin and remove

7/11/2014 5:49:44 PM

Details

diff --git a/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java b/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
index 3b128ec..ca3fbd5 100644
--- a/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
+++ b/payment/src/test/java/org/killbill/billing/payment/core/TestPaymentProcessor.java
@@ -88,7 +88,7 @@ public class TestPaymentProcessor extends PaymentTestSuiteWithEmbeddedDB {
                                                                                               SHOULD_LOCK_ACCOUNT, PLUGIN_PROPERTIES, callContext, internalCallContext);
         verifyPayment(authorizationPost3DS, paymentExternalKey, TEN, ZERO, ZERO, 2);
         verifyPaymentTransaction(authorizationPost3DS.getTransactions().get(1), authorizationPost3DSKey, TransactionType.AUTHORIZE, TEN, paymentId);
-        paymentBusListener.verify(2, account.getId(), paymentId, TEN.add(TEN) /* STEPH the processedAmount is 20; probably something wrong in the MockPlugin */);
+        paymentBusListener.verify(2, account.getId(), paymentId, TEN);
 
         // CAPTURE
         final String capture1Key = UUID.randomUUID().toString();
@@ -104,7 +104,7 @@ public class TestPaymentProcessor extends PaymentTestSuiteWithEmbeddedDB {
                                                                                    SHOULD_LOCK_ACCOUNT, PLUGIN_PROPERTIES, callContext, internalCallContext);
         verifyPayment(partialCapture2, paymentExternalKey, TEN, TEN, ZERO, 4);
         verifyPaymentTransaction(partialCapture2.getTransactions().get(3), capture2Key, TransactionType.CAPTURE, FIVE, paymentId);
-        paymentBusListener.verify(4, account.getId(), paymentId, FIVE.add(FIVE) /* STEPH the processedAmount is 20; probably something wrong in the MockPlugin */);
+        paymentBusListener.verify(4, account.getId(), paymentId, FIVE);
 
         // REFUND
         final String refund1Key = UUID.randomUUID().toString();
@@ -120,7 +120,7 @@ public class TestPaymentProcessor extends PaymentTestSuiteWithEmbeddedDB {
                                                                                  SHOULD_LOCK_ACCOUNT, PLUGIN_PROPERTIES, callContext, internalCallContext);
         verifyPayment(partialRefund2, paymentExternalKey, TEN, TEN, TEN, 6);
         verifyPaymentTransaction(partialRefund2.getTransactions().get(5), refund2Key, TransactionType.REFUND, FIVE, paymentId);
-        paymentBusListener.verify(6, account.getId(), paymentId, FIVE.add(FIVE) /* STEPH the processedAmount is 20; probably something wrong in the MockPlugin */);
+        paymentBusListener.verify(6, account.getId(), paymentId, FIVE);
     }
 
     @Test(groups = "slow")
diff --git a/payment/src/test/java/org/killbill/billing/payment/provider/MockPaymentProviderPlugin.java b/payment/src/test/java/org/killbill/billing/payment/provider/MockPaymentProviderPlugin.java
index 57ccdce..0b29446 100644
--- a/payment/src/test/java/org/killbill/billing/payment/provider/MockPaymentProviderPlugin.java
+++ b/payment/src/test/java/org/killbill/billing/payment/provider/MockPaymentProviderPlugin.java
@@ -357,7 +357,7 @@ public class MockPaymentProviderPlugin implements NoOpPaymentPluginApi {
         }
         info.addAmount(type, amount);
 
-        final PaymentTransactionInfoPlugin result = new DefaultNoOpPaymentInfoPlugin(kbPaymentId, kbTransactionId, type, info.getAmount(type), currency, clock.getUTCNow(), clock.getUTCNow(), status, null);
+        final PaymentTransactionInfoPlugin result = new DefaultNoOpPaymentInfoPlugin(kbPaymentId, kbTransactionId, type, amount, currency, clock.getUTCNow(), clock.getUTCNow(), status, null);
         return result;
     }
 }