diff --git a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
index 9ee931b..389156a 100644
--- a/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
+++ b/profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestInvoice.java
@@ -590,96 +590,6 @@ public class TestInvoice extends TestJaxrsBase {
assertEquals(killBillClient.getInvoicesForAccount(accountJson.getAccountId()).size(), 3);
}
- @Test(groups = "slow", description = "Can create an external charge on an existing invoice")
- public void testExternalChargeOnExistingInvoice() throws Exception {
- final Account accountJson = createAccountNoPMBundleAndSubscriptionAndWaitForFirstInvoice();
-
- // Get the invoices
- final List<Invoice> invoices = killBillClient.getInvoicesForAccount(accountJson.getAccountId(), true, false);
- // 2 invoices but look for the non zero dollar one
- assertEquals(invoices.size(), 2);
- final UUID invoiceId = invoices.get(1).getInvoiceId();
- final BigDecimal originalInvoiceAmount = invoices.get(1).getAmount();
- final int originalNumberOfItemsForInvoice = invoices.get(1).getItems().size();
-
- // Post an external charge
- final BigDecimal chargeAmount = BigDecimal.TEN;
- final InvoiceItem externalCharge = new InvoiceItem();
- externalCharge.setAccountId(accountJson.getAccountId());
- externalCharge.setAmount(chargeAmount);
- externalCharge.setCurrency(accountJson.getCurrency());
- externalCharge.setInvoiceId(invoiceId);
- final InvoiceItem createdExternalCharge = killBillClient.createExternalCharge(externalCharge, clock.getUTCToday(), false, true, createdBy, reason, comment);
- final Invoice invoiceWithItems = killBillClient.getInvoice(createdExternalCharge.getInvoiceId(), true);
- assertEquals(invoiceWithItems.getItems().size(), originalNumberOfItemsForInvoice + 1);
- assertNull(invoiceWithItems.getItems().get(originalNumberOfItemsForInvoice).getBundleId());
-
- // Verify the new invoice balance
- final Invoice adjustedInvoice = killBillClient.getInvoice(invoiceId);
- final BigDecimal adjustedInvoiceBalance = originalInvoiceAmount.add(chargeAmount.setScale(2, RoundingMode.HALF_UP));
- assertEquals(adjustedInvoice.getBalance().compareTo(adjustedInvoiceBalance), 0);
- }
-
- @Test(groups = "slow", description = "Can create an external charge on an existing invoice and trigger a payment")
- public void testExternalChargeOnExistingInvoiceWithAutomaticPayment() throws Exception {
- final Account accountJson = createAccountWithPMBundleAndSubscriptionAndWaitForFirstInvoice();
-
- // Get the invoices
- final List<Invoice> invoices = killBillClient.getInvoicesForAccount(accountJson.getAccountId(), true, false);
- // 2 invoices but look for the non zero dollar one
- assertEquals(invoices.size(), 2);
- final UUID invoiceId = invoices.get(1).getInvoiceId();
- final BigDecimal originalInvoiceAmount = invoices.get(1).getAmount();
- final int originalNumberOfItemsForInvoice = invoices.get(1).getItems().size();
-
- // Post an external charge
- final BigDecimal chargeAmount = BigDecimal.TEN;
- final InvoiceItem externalCharge = new InvoiceItem();
- externalCharge.setAccountId(accountJson.getAccountId());
- externalCharge.setAmount(chargeAmount);
- externalCharge.setCurrency(accountJson.getCurrency());
- externalCharge.setInvoiceId(invoiceId);
- final InvoiceItem createdExternalCharge = killBillClient.createExternalCharge(externalCharge, clock.getUTCToday(), true, true, createdBy, reason, comment);
- final Invoice invoiceWithItems = killBillClient.getInvoice(createdExternalCharge.getInvoiceId(), true);
- assertEquals(invoiceWithItems.getItems().size(), originalNumberOfItemsForInvoice + 1);
- assertNull(invoiceWithItems.getItems().get(originalNumberOfItemsForInvoice).getBundleId());
-
- // Verify the new invoice balance
- final Invoice adjustedInvoice = killBillClient.getInvoice(invoiceId);
- assertEquals(adjustedInvoice.getBalance().compareTo(BigDecimal.ZERO), 0);
- }
-
- @Test(groups = "slow", description = "Can create an external charge for a bundle on an existing invoice")
- public void testExternalChargeForBundleOnExistingInvoice() throws Exception {
- final Account accountJson = createAccountNoPMBundleAndSubscriptionAndWaitForFirstInvoice();
-
- // Get the invoices
- final List<Invoice> invoices = killBillClient.getInvoicesForAccount(accountJson.getAccountId(), true, false);
- // 2 invoices but look for the non zero dollar one
- assertEquals(invoices.size(), 2);
- final UUID invoiceId = invoices.get(1).getInvoiceId();
- final BigDecimal originalInvoiceAmount = invoices.get(1).getAmount();
- final int originalNumberOfItemsForInvoice = invoices.get(1).getItems().size();
-
- // Post an external charge
- final BigDecimal chargeAmount = BigDecimal.TEN;
- final UUID bundleId = UUID.randomUUID();
- final InvoiceItem externalCharge = new InvoiceItem();
- externalCharge.setAccountId(accountJson.getAccountId());
- externalCharge.setAmount(chargeAmount);
- externalCharge.setCurrency(accountJson.getCurrency());
- externalCharge.setInvoiceId(invoiceId);
- externalCharge.setBundleId(bundleId);
- final InvoiceItem createdExternalCharge = killBillClient.createExternalCharge(externalCharge, clock.getUTCToday(), false, true, createdBy, reason, comment);
- final Invoice invoiceWithItems = killBillClient.getInvoice(createdExternalCharge.getInvoiceId(), true);
- assertEquals(invoiceWithItems.getItems().size(), originalNumberOfItemsForInvoice + 1);
- assertEquals(invoiceWithItems.getItems().get(originalNumberOfItemsForInvoice).getBundleId(), bundleId);
-
- // Verify the new invoice balance
- final Invoice adjustedInvoice = killBillClient.getInvoice(invoiceId);
- final BigDecimal adjustedInvoiceBalance = originalInvoiceAmount.add(chargeAmount.setScale(2, RoundingMode.HALF_UP));
- assertEquals(adjustedInvoice.getBalance().compareTo(adjustedInvoiceBalance), 0);
- }
@Test(groups = "slow", description = "Can paginate and search through all invoices")
public void testInvoicesPagination() throws Exception {
