diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index b795594..16d02f8 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -40,6 +40,7 @@ import org.killbill.billing.routing.plugin.api.PaymentRoutingApiException;
import org.killbill.bus.api.PersistentBus.EventBusException;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
@@ -64,7 +65,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
private Account account;
- @BeforeClass(groups = "slow")
+ @BeforeMethod(groups = "slow")
public void beforeMethod() throws Exception {
super.beforeMethod();
account = testHelper.createTestAccount("bobo@gmail.com", true);
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiWithControl.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiWithControl.java
new file mode 100644
index 0000000..5564676
--- /dev/null
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApiWithControl.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2014-2015 Groupon, Inc
+ * Copyright 2014-2015 The Billing Project, LLC
+ *
+ * The Billing Project 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 org.killbill.billing.payment.api;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.UUID;
+
+import org.killbill.billing.account.api.Account;
+import org.killbill.billing.catalog.api.Currency;
+import org.killbill.billing.osgi.api.OSGIServiceDescriptor;
+import org.killbill.billing.osgi.api.OSGIServiceRegistration;
+import org.killbill.billing.payment.PaymentTestSuiteWithEmbeddedDB;
+import org.killbill.billing.payment.provider.DefaultNoOpPaymentMethodPlugin;
+import org.killbill.billing.payment.provider.MockPaymentProviderPlugin;
+import org.killbill.billing.routing.plugin.api.OnFailurePaymentRoutingResult;
+import org.killbill.billing.routing.plugin.api.OnSuccessPaymentRoutingResult;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingApiException;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingContext;
+import org.killbill.billing.routing.plugin.api.PaymentRoutingPluginApi;
+import org.killbill.billing.routing.plugin.api.PriorPaymentRoutingResult;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableList;
+import com.google.inject.Inject;
+
+public class TestPaymentApiWithControl extends PaymentTestSuiteWithEmbeddedDB {
+
+ @Inject
+ private OSGIServiceRegistration<PaymentRoutingPluginApi> retryPluginRegistry;
+
+ private Account account;
+ private UUID newPaymentMethodId;
+
+ @BeforeMethod(groups = "slow")
+ public void beforeMethod() throws Exception {
+ super.beforeMethod();
+ account = testHelper.createTestAccount("bobo@gmail.com", true);
+ final PaymentMethodPlugin paymentMethodInfo = new DefaultNoOpPaymentMethodPlugin(UUID.randomUUID().toString(), false, null);
+ newPaymentMethodId = paymentApi.addPaymentMethod(account, paymentMethodInfo.getExternalPaymentMethodId(), MockPaymentProviderPlugin.PLUGIN_NAME, false, paymentMethodInfo, ImmutableList.<PluginProperty>of(), callContext);
+
+ retryPluginRegistry.registerService(new OSGIServiceDescriptor() {
+ @Override
+ public String getPluginSymbolicName() {
+ return null;
+ }
+
+ @Override
+ public String getRegistrationName() {
+ return TestPaymentRoutingPluginApi.PLUGIN_NAME;
+ }
+ }, new TestPaymentRoutingPluginApi(newPaymentMethodId));
+
+ }
+
+ public static class TestPaymentRoutingPluginApi implements PaymentRoutingPluginApi {
+
+ public static final String PLUGIN_NAME = "TEST_ROUTING_API_PLUGIN_NAME";
+
+ private final UUID newPaymentMethodId;
+
+ public TestPaymentRoutingPluginApi(final UUID newPaymentMethodId) {
+ this.newPaymentMethodId = newPaymentMethodId;
+ }
+
+ @Override
+ public PriorPaymentRoutingResult priorCall(final PaymentRoutingContext context, final Iterable<PluginProperty> properties) throws PaymentRoutingApiException {
+ return new PriorPaymentRoutingResult() {
+ @Override
+ public boolean isAborted() {
+ return false;
+ }
+
+ @Override
+ public BigDecimal getAdjustedAmount() {
+ return null;
+ }
+
+ @Override
+ public Currency getAdjustedCurrency() {
+ return null;
+ }
+
+ @Override
+ public UUID getAdjustedPaymentMethodId() {
+ return newPaymentMethodId;
+ }
+ };
+ }
+
+ @Override
+ public OnSuccessPaymentRoutingResult onSuccessCall(final PaymentRoutingContext context, final Iterable<PluginProperty> properties) throws PaymentRoutingApiException {
+ return null;
+ }
+
+ @Override
+ public OnFailurePaymentRoutingResult onFailureCall(final PaymentRoutingContext context, final Iterable<PluginProperty> properties) throws PaymentRoutingApiException {
+ return null;
+ }
+ }
+
+ // Verify Payment control API can be used to change the paymentMethodId on the fly and this is reflected in the created Payment.
+ @Test(groups = "slow")
+ public void testCreateAuthWithControl() throws PaymentApiException {
+
+ final BigDecimal requestedAmount = BigDecimal.TEN;
+
+ final String paymentExternalKey = "dfdf";
+ final String transactionExternalKey = "qwqwqw";
+
+ final PaymentOptions paymentOptions = new PaymentOptions() {
+ @Override
+ public boolean isExternalPayment() {
+ return false;
+ }
+
+ @Override
+ public List<String> getPaymentControlPluginNames() {
+ return ImmutableList.of(TestPaymentRoutingPluginApi.PLUGIN_NAME);
+ }
+ };
+
+ final Payment payment = paymentApi.createAuthorizationWithPaymentControl(account, account.getPaymentMethodId(), null, requestedAmount, Currency.USD, paymentExternalKey, transactionExternalKey,
+ ImmutableList.<PluginProperty>of(), paymentOptions, callContext);
+
+ Assert.assertEquals(payment.getPaymentMethodId(), newPaymentMethodId);
+ }
+}
