killbill-memoizeit

diff --git a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
index cab1a77..aa965a6 100644
--- a/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
+++ b/api/src/main/java/com/ning/billing/payment/plugin/api/PaymentPluginApi.java
@@ -48,7 +48,7 @@ public interface PaymentPluginApi {
     public String addPaymentMethod(String accountKey, PaymentMethodPlugin paymentMethodProps, boolean setDefault)
     throws PaymentPluginApiException;
 
-    public void updatePaymentMethod(String accountKey, String externalPaymentMethodId, PaymentMethodPlugin paymentMethodProps)
+    public void updatePaymentMethod(String accountKey, PaymentMethodPlugin paymentMethodProps)
     throws PaymentPluginApiException;
 
     public void deletePaymentMethod(String accountKey, String externalPaymentMethodId)

diff --git a/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentMethodPlugin.java b/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentMethodPlugin.java
new file mode 100644
index 0000000..a27a095
--- /dev/null
+++ b/payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentMethodPlugin.java
@@ -0,0 +1,52 @@
+/* 
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.ning.billing.payment.api;
+
+import java.util.List;
+
+public class DefaultPaymentMethodPlugin implements PaymentMethodPlugin {
+
+    private final String externalPaymentMethodId;
+    private final boolean isDefaultPaymentMethod;
+    private final List<PaymentMethodKVInfo> properties;
+    
+    public DefaultPaymentMethodPlugin(PaymentMethodPlugin src, String externalPaymentId) {
+        this.externalPaymentMethodId = externalPaymentId;
+        this.isDefaultPaymentMethod = src.isDefaultPaymentMethod();
+        this.properties = src.getProperties();
+    }
+    
+    @Override
+    public String getExternalPaymentMethodId() {
+        return externalPaymentMethodId;
+    }
+
+    @Override
+    public boolean isDefaultPaymentMethod() {
+        return isDefaultPaymentMethod;
+    }
+
+    @Override
+    public List<PaymentMethodKVInfo> getProperties() {
+        return properties;
+    }
+
+    @Override
+    public String getValueString(String key) {
+        throw new RuntimeException("Not implemented");
+    }
+
+}

diff --git a/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java b/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
index 2f73558..5ff43dc 100644
--- a/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
+++ b/payment/src/main/java/com/ning/billing/payment/core/PaymentMethodProcessor.java
@@ -34,11 +34,16 @@ import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.account.api.DefaultMutableAccountData;
 import com.ning.billing.account.api.MutableAccountData;
 import com.ning.billing.payment.api.DefaultPaymentMethod;
+import com.ning.billing.payment.api.DefaultPaymentMethodPlugin;
+import com.ning.billing.payment.api.Payment;
 import com.ning.billing.payment.api.PaymentApiException;
 import com.ning.billing.payment.api.PaymentMethod;
 import com.ning.billing.payment.api.PaymentMethodPlugin;
+import com.ning.billing.payment.core.ProcessorBase.CallableWithAccountLock;
+import com.ning.billing.payment.core.ProcessorBase.WithAccountLockCallback;
 import com.ning.billing.payment.dao.PaymentDao;
 import com.ning.billing.payment.dao.PaymentMethodModelDao;
+import com.ning.billing.payment.dispatcher.PluginDispatcher;
 import com.ning.billing.payment.plugin.api.PaymentPluginApiException;
 import com.ning.billing.payment.plugin.api.PaymentPluginApi;
 import com.ning.billing.payment.provider.PaymentProviderPluginRegistry;
@@ -47,8 +52,7 @@ import com.ning.billing.util.callcontext.CallContext;
 import com.ning.billing.util.globallocker.GlobalLocker;
 
 public class PaymentMethodProcessor extends ProcessorBase {
-
-
+    
     @Inject
     public PaymentMethodProcessor(final PaymentProviderPluginRegistry pluginRegistry,
             final AccountUserApi accountUserApi,
@@ -64,69 +68,86 @@ public class PaymentMethodProcessor extends ProcessorBase {
     }
 
 
-    public String initializeAccountPlugin(String pluginName, Account account) throws PaymentApiException {
-        PaymentPluginApi pluginApi = null;
-        try {
-            // STEPH do we want to really have a default or fail?? probably fail
-            pluginApi = pluginRegistry.getPlugin(pluginName);
-            return pluginApi.createPaymentProviderAccount(account);
-        } catch (PaymentPluginApiException e) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_PLUGIN_ACCOUNT_INIT,
-                    account.getId(), pluginApi != null ? pluginApi.getName() : null, e.getErrorMessage());
-        }
+    public String initializeAccountPlugin(final String pluginName, final Account account) throws PaymentApiException {
+    
+        return new WithAccountLock<String>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<String>() {
+
+            @Override
+            public String doOperation() throws PaymentApiException {
+                PaymentPluginApi pluginApi = null;
+                try {
+                    // STEPH do we want to really have a default or fail?? probably fail
+                    pluginApi = pluginRegistry.getPlugin(pluginName);
+                    return pluginApi.createPaymentProviderAccount(account);
+                } catch (PaymentPluginApiException e) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_PLUGIN_ACCOUNT_INIT,
+                            account.getId(), pluginApi != null ? pluginApi.getName() : null, e.getErrorMessage());
+                }
+            }
+        });
     }
 
 
-    public UUID addPaymentMethod(String pluginName, Account account,
-            boolean setDefault, final PaymentMethodPlugin paymentMethodProps, CallContext context) 
+    public UUID addPaymentMethod(final String pluginName, final Account account,
+            final boolean setDefault, final PaymentMethodPlugin paymentMethodProps, final CallContext context) 
     throws PaymentApiException {
         
-        PaymentMethod pm = null;
-        PaymentPluginApi pluginApi = null;
-        try {
-            pluginApi = pluginRegistry.getPlugin(pluginName);
-            pm = new DefaultPaymentMethod(account.getId(), pluginName, paymentMethodProps);
-            String externalId = pluginApi.addPaymentMethod(account.getExternalKey(), paymentMethodProps, setDefault);
-            PaymentMethodModelDao pmModel = new PaymentMethodModelDao(pm.getId(), pm.getAccountId(), pm.getPluginName(), pm.isActive(), externalId);
-            paymentDao.insertPaymentMethod(pmModel, context);
-            
-            if (setDefault) {
-                MutableAccountData updateAccountData = new DefaultMutableAccountData(account);
-                updateAccountData.setPaymentMethodId(pm.getId());
-                accountUserApi.updateAccount(account.getId(), updateAccountData, context);
+        return new WithAccountLock<UUID>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<UUID>() {
+
+            @Override
+            public UUID doOperation() throws PaymentApiException {
+                PaymentMethod pm = null;
+                PaymentPluginApi pluginApi = null;
+                try {
+                    pluginApi = pluginRegistry.getPlugin(pluginName);
+                    pm = new DefaultPaymentMethod(account.getId(), pluginName, paymentMethodProps);
+                    String externalId = pluginApi.addPaymentMethod(account.getExternalKey(), paymentMethodProps, setDefault);
+                    PaymentMethodModelDao pmModel = new PaymentMethodModelDao(pm.getId(), pm.getAccountId(), pm.getPluginName(), pm.isActive(), externalId);
+                    paymentDao.insertPaymentMethod(pmModel, context);
+                    
+                    if (setDefault) {
+                        MutableAccountData updateAccountData = new DefaultMutableAccountData(account);
+                        updateAccountData.setPaymentMethodId(pm.getId());
+                        accountUserApi.updateAccount(account.getId(), updateAccountData, context);
+                    }
+                } catch (PaymentPluginApiException e) {
+                    // STEPH all errors should also take a pluginName
+                    throw new PaymentApiException(ErrorCode.PAYMENT_ADD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                } catch (AccountApiException e) {
+                    throw new PaymentApiException(e);            
+                }
+                return pm.getId();
             }
-        } catch (PaymentPluginApiException e) {
-            // STEPH all errors should also take a pluginName
-            throw new PaymentApiException(ErrorCode.PAYMENT_ADD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
-        } catch (AccountApiException e) {
-            throw new PaymentApiException(e);            
-        }
-        return pm.getId();
+        });
     }
   
 
-    public List<PaymentMethod> refreshPaymentMethods(String pluginName,
-            Account account, final CallContext context)
-            throws PaymentApiException {
+    public List<PaymentMethod> refreshPaymentMethods(final String pluginName, final Account account, final CallContext context)
+    throws PaymentApiException {
 
-        List<PaymentMethod> result = new LinkedList<PaymentMethod>();
-        PaymentPluginApi pluginApi = null;
-        try {
-            pluginApi = pluginRegistry.getPlugin(pluginName);            
-            List<PaymentMethodPlugin> pluginPms = pluginApi.getPaymentMethodDetails(account.getExternalKey());
-            for (PaymentMethodPlugin cur : pluginPms) {
-                PaymentMethod input = new DefaultPaymentMethod(account.getId(), pluginName, cur);
-                PaymentMethodModelDao pmModel = new PaymentMethodModelDao(input.getId(), input.getAccountId(), input.getPluginName(), input.isActive(), input.getPluginDetail().getExternalPaymentMethodId());
-                // STEPH we should insert within one batch
-                paymentDao.insertPaymentMethod(pmModel, context);
-                result.add(input);
-            }
-        } catch (PaymentPluginApiException e) {
-            // STEPH all errors should also take a pluginName
-            throw new PaymentApiException(ErrorCode.PAYMENT_REFRESH_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
-        }
-        return result;
+        return new WithAccountLock<List<PaymentMethod>>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<List<PaymentMethod>>() {
 
+            @Override
+            public List<PaymentMethod> doOperation() throws PaymentApiException {
+                List<PaymentMethod> result = new LinkedList<PaymentMethod>();
+                PaymentPluginApi pluginApi = null;
+                try {
+                    pluginApi = pluginRegistry.getPlugin(pluginName);            
+                    List<PaymentMethodPlugin> pluginPms = pluginApi.getPaymentMethodDetails(account.getExternalKey());
+                    for (PaymentMethodPlugin cur : pluginPms) {
+                        PaymentMethod input = new DefaultPaymentMethod(account.getId(), pluginName, cur);
+                        PaymentMethodModelDao pmModel = new PaymentMethodModelDao(input.getId(), input.getAccountId(), input.getPluginName(), input.isActive(), input.getPluginDetail().getExternalPaymentMethodId());
+                        // STEPH we should insert within one batch
+                        paymentDao.insertPaymentMethod(pmModel, context);
+                        result.add(input);
+                    }
+                } catch (PaymentPluginApiException e) {
+                    // STEPH all errors should also take a pluginName
+                    throw new PaymentApiException(ErrorCode.PAYMENT_REFRESH_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                }
+                return result;
+            }
+        });
     }
 
     public List<PaymentMethod> getPaymentMethods(Account account, boolean withPluginDetail) throws PaymentApiException {
@@ -152,9 +173,7 @@ public class PaymentMethodProcessor extends ProcessorBase {
     private List<PaymentMethod> getPaymentMethodInternal(List<PaymentMethodModelDao> paymentMethodModels, UUID accountId, String accountKey, boolean withPluginDetail)
     throws PaymentApiException {
 
-
         List<PaymentMethod> result = new ArrayList<PaymentMethod>(paymentMethodModels.size());
-
         PaymentPluginApi pluginApi = null;
         try {
             List<PaymentMethodPlugin> pluginDetails = null;            
@@ -176,7 +195,6 @@ public class PaymentMethodProcessor extends ProcessorBase {
     
     
     private PaymentMethodPlugin getPaymentMethodDetail(List<PaymentMethodPlugin> pluginDetails, String externalId) {
-        
         if (pluginDetails == null) {
             return null;
         }
@@ -191,64 +209,82 @@ public class PaymentMethodProcessor extends ProcessorBase {
     public void updatePaymentMethod(final Account account, final UUID paymentMethodId,
             final PaymentMethodPlugin paymentMethodProps) 
     throws PaymentApiException {
-        
-        PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
-        if (paymentMethodModel == null) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
-        }
 
-        try {
-            PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());    
-            pluginApi.updatePaymentMethod(account.getExternalKey(), paymentMethodModel.getExternalId(), paymentMethodProps);
-        } catch (PaymentPluginApiException e) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_UPD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
-        }
+        new WithAccountLock<Void>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<Void>() {
+
+            @Override
+            public Void doOperation() throws PaymentApiException {
+                PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
+                if (paymentMethodModel == null) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
+                }
+
+                try {
+                    PaymentMethodPlugin inputWithId = new DefaultPaymentMethodPlugin(paymentMethodProps, paymentMethodModel.getExternalId());
+                    PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());    
+                    pluginApi.updatePaymentMethod(account.getExternalKey(), inputWithId);
+                    return null;
+                } catch (PaymentPluginApiException e) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_UPD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                }
+            }
+        }); 
     }
 
 
-    public void deletedPaymentMethod(Account account, UUID paymentMethodId) 
+    public void deletedPaymentMethod(final Account account, final UUID paymentMethodId) 
     throws PaymentApiException {
 
-        PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
-        if (paymentMethodModel == null) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
-        }
+        new WithAccountLock<Void>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<Void>() {
 
-        try {
-            if (account.getPaymentMethodId().equals(paymentMethodId)) {
-                throw new PaymentApiException(ErrorCode.PAYMENT_DEL_DEFAULT_PAYMENT_METHOD, account.getId());                
-            }
-            
-            PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());                
+            @Override
+            public Void doOperation() throws PaymentApiException {
+                PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
+                if (paymentMethodModel == null) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
+                }
 
-            pluginApi.deletePaymentMethod(account.getExternalKey(), paymentMethodModel.getExternalId());
-        } catch (PaymentPluginApiException e) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_DEL_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                try {
+                    if (account.getPaymentMethodId().equals(paymentMethodId)) {
+                        throw new PaymentApiException(ErrorCode.PAYMENT_DEL_DEFAULT_PAYMENT_METHOD, account.getId());                
+                    }
+                    PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());                
+                    pluginApi.deletePaymentMethod(account.getExternalKey(), paymentMethodModel.getExternalId());
+                    paymentDao.deletedPaymentMethod(paymentMethodId);
+                    return null;
+                } catch (PaymentPluginApiException e) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_DEL_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                }
+            }});       
         }
-        
-    }
 
-    public void setDefaultPaymentMethod(Account account, UUID paymentMethodId, final CallContext context) 
+    public void setDefaultPaymentMethod(final Account account, final UUID paymentMethodId, final CallContext context) 
     throws PaymentApiException {
-        
-        PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
-        if (paymentMethodModel == null) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
-        }
 
-        try {
-            PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());                            
-            pluginApi.setDefaultPaymentMethod(account.getExternalKey(), paymentMethodModel.getExternalId());
-            MutableAccountData updateAccountData = new DefaultMutableAccountData(account);
-            updateAccountData.setPaymentMethodId(paymentMethodId);
-            accountUserApi.updateAccount(account.getId(), updateAccountData, context);
-        } catch (PaymentPluginApiException e) {
-            throw new PaymentApiException(ErrorCode.PAYMENT_UPD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
-        } catch (AccountApiException e) {
-            throw new PaymentApiException(e);            
-        }
+        new WithAccountLock<Void>().processAccountWithLock(locker, account.getExternalKey(), new WithAccountLockCallback<Void>() {
+
+            @Override
+            public Void doOperation() throws PaymentApiException {
+                PaymentMethodModelDao paymentMethodModel = paymentDao.getPaymentMethod(paymentMethodId);
+                if (paymentMethodModel == null) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_NO_SUCH_PAYMENT_METHOD, account.getId(), paymentMethodId);
+                }
+
+                try {
+                    PaymentPluginApi pluginApi = getPluginApi(paymentMethodId, account.getId());                            
+                    pluginApi.setDefaultPaymentMethod(account.getExternalKey(), paymentMethodModel.getExternalId());
+                    MutableAccountData updateAccountData = new DefaultMutableAccountData(account);
+                    updateAccountData.setPaymentMethodId(paymentMethodId);
+                    accountUserApi.updateAccount(account.getId(), updateAccountData, context);
+                    return null;
+                } catch (PaymentPluginApiException e) {
+                    throw new PaymentApiException(ErrorCode.PAYMENT_UPD_PAYMENT_METHOD, account.getId(), e.getErrorMessage());
+                } catch (AccountApiException e) {
+                    throw new PaymentApiException(e);            
+                }
+            }});               
     }
-    
+
     private PaymentPluginApi getPluginApi(UUID paymentMethodId, UUID accountId)
         throws PaymentApiException {
         PaymentMethodModelDao paymentMethod = paymentDao.getPaymentMethod(paymentMethodId);

diff --git a/payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java b/payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java
index 410fd08..1901ee7 100644
--- a/payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java
+++ b/payment/src/main/java/com/ning/billing/payment/core/ProcessorBase.java
@@ -135,7 +135,6 @@ public abstract class ProcessorBase {
         }
     }
     
-    // STEPH might not need that anymore
     public static class WithAccountLock<T> {
         
         public T processAccountWithLock(final GlobalLocker locker, final String accountExternalKey, final WithAccountLockCallback<T> callback)

diff --git a/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java b/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
index a4bf728..810883b 100644
--- a/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
+++ b/payment/src/main/java/com/ning/billing/payment/provider/DefaultNoOpPaymentProviderPlugin.java
@@ -140,9 +140,9 @@ public class DefaultNoOpPaymentProviderPlugin implements NoOpPaymentPluginApi {
 
 
     @Override
-    public void updatePaymentMethod(String accountKey, String externalPaymentId, PaymentMethodPlugin paymentMethodProps)
+    public void updatePaymentMethod(String accountKey, PaymentMethodPlugin paymentMethodProps)
         throws PaymentPluginApiException {
-        DefaultNoOpPaymentMethodPlugin e = getPaymentMethod(accountKey, externalPaymentId);
+        DefaultNoOpPaymentMethodPlugin e = getPaymentMethod(accountKey, paymentMethodProps.getExternalPaymentMethodId());
         if (e != null) {
             e.setProps(paymentMethodProps.getProperties());
         }

diff --git a/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
index 358a36c..d1b94c1 100644
--- a/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.fail;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.List;
 import java.util.UUID;
 
 import org.joda.time.DateTime;
@@ -30,6 +31,7 @@ import org.joda.time.DateTimeZone;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
@@ -49,6 +51,7 @@ import com.ning.billing.payment.MockRecurringInvoiceItem;
 import com.ning.billing.payment.TestHelper;
 import com.ning.billing.payment.api.Payment.PaymentAttempt;
 import com.ning.billing.payment.glue.PaymentTestModuleWithMocks;
+import com.ning.billing.payment.provider.DefaultNoOpPaymentMethodPlugin;
 import com.ning.billing.util.bus.Bus;
 import com.ning.billing.util.bus.Bus.EventBusException;
 import com.ning.billing.util.callcontext.CallContext;
@@ -77,10 +80,18 @@ public class TestPaymentApi {
 
     protected CallContext context;
 
+    private Account account; 
+    
+    
     @Inject
     public TestPaymentApi(Clock clock) {
         context = new DefaultCallContext("Payment Tests", CallOrigin.INTERNAL, UserType.SYSTEM, clock);
     }
+    
+    @BeforeClass
+    public void setupClass() throws Exception {
+        account = testHelper.createTestAccount("yoyo.yahoo.com");        
+    }
 
     @BeforeMethod(alwaysRun = true)
     public void setUp() throws EventBusException {
@@ -127,9 +138,7 @@ public class TestPaymentApi {
         final BigDecimal expectedAmount = null;        
         
         testSimplePayment(invoiceAmount, requestedAmount, expectedAmount);
-
     }
-
     
 
     private void testSimplePayment(BigDecimal invoiceAmount, BigDecimal requestedAmount, BigDecimal expectedAmount) throws Exception {
@@ -137,7 +146,6 @@ public class TestPaymentApi {
         ((ZombieControl)invoicePaymentApi).addResult("notifyOfPaymentAttempt", BrainDeadProxyFactory.ZOMBIE_VOID);
 
         final DateTime now = new DateTime(DateTimeZone.UTC);
-        final Account account = testHelper.createTestAccount("yoyo.yahoo.com");
         final Invoice invoice = testHelper.createTestInvoice(account, now, Currency.USD);
         
         final UUID subscriptionId = UUID.randomUUID();
@@ -179,6 +187,40 @@ public class TestPaymentApi {
             }
         }
     }
+    
+    @Test(enabled=true)
+    public void testPaymentMethods() throws Exception  {
+
+        List<PaymentMethod> methods = paymentApi.getPaymentMethods(account, false);
+        assertEquals(methods.size(), 1);
+        
+        PaymentMethod initDefaultMethod = methods.get(0);
+        assertEquals(initDefaultMethod.getId(), account.getPaymentMethodId());
+        
+
+        
+        //((ZombieControl)accountApi).addResult("updateAccount", );
+        PaymentMethodPlugin newPaymenrMethod = new DefaultNoOpPaymentMethodPlugin(UUID.randomUUID().toString(), true, null);
+        UUID newPaymentMethodId = paymentApi.addPaymentMethod(PaymentTestModuleWithMocks.PLUGIN_TEST_NAME, account, true, newPaymenrMethod, context);
+        ((ZombieControl)account).addResult("getPaymentMethodId", newPaymentMethodId);
+        
+        methods = paymentApi.getPaymentMethods(account, false);
+        assertEquals(methods.size(), 2);
+        
+        assertEquals(newPaymentMethodId, account.getPaymentMethodId());
+        
+        boolean failed = false;
+        try {
+            paymentApi.deletedPaymentMethod(account, newPaymentMethodId, context);
+        } catch (PaymentApiException e) {
+            failed = true;
+        }
+        assertTrue(failed);
+
+        paymentApi.deletedPaymentMethod(account, initDefaultMethod.getId(), context);
+        methods = paymentApi.getPaymentMethods(account, false);        
+        assertEquals(methods.size(), 1);
+    }
 
     
 }