diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java
new file mode 100644
index 0000000..5953157
--- /dev/null
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestAdmin.java
@@ -0,0 +1,118 @@
+/*
+ * 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.jaxrs;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import org.killbill.billing.client.KillBillClientException;
+import org.killbill.billing.client.KillBillHttpClient;
+import org.killbill.billing.client.model.Account;
+import org.killbill.billing.client.model.Payment;
+import org.killbill.billing.client.model.PaymentTransaction;
+import org.killbill.billing.jaxrs.json.AdminPaymentJson;
+import org.killbill.billing.payment.api.TransactionStatus;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
+public class TestAdmin extends TestJaxrsBase {
+
+ @Test(groups = "slow")
+ public void testAdminPaymentEndpoint() throws Exception {
+ final Account account = createAccountWithDefaultPaymentMethod();
+
+ final String paymentExternalKey = "extkey";
+
+ // Create Authorization
+ final String authTransactionExternalKey = UUID.randomUUID().toString();
+ final PaymentTransaction authTransaction = new PaymentTransaction();
+ authTransaction.setAmount(BigDecimal.TEN);
+ authTransaction.setCurrency(account.getCurrency());
+ authTransaction.setPaymentExternalKey(paymentExternalKey);
+ authTransaction.setTransactionExternalKey(authTransactionExternalKey);
+ authTransaction.setTransactionType("AUTHORIZE");
+ final Payment authPayment = killBillClient.createPayment(account.getAccountId(), account.getPaymentMethodId(), authTransaction, createdBy, reason, comment);
+
+ // First fix transactionStatus and paymentSstate (but not lastSuccessPaymentState
+ // Note that state is not consistent between TransactionStatus and lastSuccessPaymentState but we don't care.
+ fixPaymentState(authPayment, null, "AUTH_FAILED", TransactionStatus.PAYMENT_FAILURE);
+
+ final Payment updatedPayment1 = killBillClient.getPayment(authPayment.getPaymentId());
+ Assert.assertEquals(updatedPayment1.getTransactions().size(), 1);
+ final PaymentTransaction authTransaction1 = updatedPayment1.getTransactions().get(0);
+ Assert.assertEquals(authTransaction1.getStatus(), TransactionStatus.PAYMENT_FAILURE.toString());
+
+ // Capture should succeed because lastSuccessPaymentState was left untouched
+ doCapture(updatedPayment1, false);
+
+ fixPaymentState(authPayment, "AUTH_FAILED", "AUTH_FAILED", TransactionStatus.PAYMENT_FAILURE);
+
+ final Payment updatedPayment2 = killBillClient.getPayment(authPayment.getPaymentId());
+ Assert.assertEquals(updatedPayment2.getTransactions().size(), 2);
+ final PaymentTransaction authTransaction2 = updatedPayment2.getTransactions().get(0);
+ Assert.assertEquals(authTransaction2.getStatus(), TransactionStatus.PAYMENT_FAILURE.toString());
+
+ final PaymentTransaction captureTransaction2 = updatedPayment2.getTransactions().get(1);
+ Assert.assertEquals(captureTransaction2.getStatus(), TransactionStatus.SUCCESS.toString());
+
+ // Capture should now failed because lastSuccessPaymentState was moved to AUTH_FAILED
+ doCapture(updatedPayment2, true);
+ }
+
+ private void doCapture(final Payment payment, final boolean expectException) throws KillBillClientException {
+ // Payment object does not export state, this is purely internal, so to verify that we indeed changed to Failed, we can attempt
+ // a capture, which should fail
+ final String capture1TransactionExternalKey = UUID.randomUUID().toString();
+ final PaymentTransaction captureTransaction = new PaymentTransaction();
+ captureTransaction.setPaymentId(payment.getPaymentId());
+ captureTransaction.setAmount(BigDecimal.ONE);
+ captureTransaction.setCurrency(payment.getCurrency());
+ captureTransaction.setPaymentExternalKey(payment.getPaymentExternalKey());
+ captureTransaction.setTransactionExternalKey(capture1TransactionExternalKey);
+ try {
+ killBillClient.captureAuthorization(captureTransaction, createdBy, reason, comment);
+ if (expectException) {
+ Assert.fail("Capture should not succeed, after auth was moved to a PAYMENT_FAILURE");
+ }
+ } catch (final KillBillClientException mabeExpected) {
+ if (!expectException) {
+ throw mabeExpected;
+ }
+ }
+
+ }
+
+
+ private void fixPaymentState(final Payment payment, final String lastSuccessPaymentState, final String currentPaymentStateName, final TransactionStatus transactionStatus) throws KillBillClientException {
+ //
+ // We do not expose the endpoint in the client API on purpose since this should only be accessed using special permission ADMIN_CAN_FIX_DATA
+ // for when there is a need to fix payment state.
+ //
+ final String uri = "/1.0/kb/admin/payments/" + payment.getPaymentId().toString() + "/transactions/" + payment.getTransactions().get(0).getTransactionId().toString();
+
+ final AdminPaymentJson body = new AdminPaymentJson(lastSuccessPaymentState, currentPaymentStateName, transactionStatus.toString());
+ final Multimap result = HashMultimap.create();
+ result.put(KillBillHttpClient.AUDIT_OPTION_CREATED_BY, createdBy);
+ result.put(KillBillHttpClient.AUDIT_OPTION_REASON, reason);
+ result.put(KillBillHttpClient.AUDIT_OPTION_COMMENT, comment);
+ killBillHttpClient.doPut(uri, body, result);
+ }
+}
