Skip to content

Commit

Permalink
jaxrs: Fix catalog broken test (api change)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbrossie
sbrossie committed Aug 4, 2016
1 parent 36741f1 commit a5912cf
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 28 deletions.
6 changes: 4 additions & 2 deletions profiles/killbill/src/main/resources/killbill-server.properties
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
# under the License. # under the License.
# #


org.killbill.jruby.context.version=RUBY2_0

# #
# KILLBILL GENERIC PROPERTIES # KILLBILL GENERIC PROPERTIES
# #
# Database config # Database config
org.killbill.dao.url=jdbc:mysql://127.0.0.1:3306/killbill org.killbill.dao.url=jdbc:mysql://127.0.0.1:3306/killbill_0_17_x
org.killbill.dao.user=root org.killbill.dao.user=root
org.killbill.dao.password=root org.killbill.dao.password=root
org.killbill.dao.logLevel=DEBUG org.killbill.dao.logLevel=DEBUG
Expand Down Expand Up @@ -59,7 +61,7 @@ org.killbill.tenant.broadcast.rate=1s
# PLUGIN SPECIFIC PROPERTIES # PLUGIN SPECIFIC PROPERTIES
# #
# Database config (OSGI plugins) # Database config (OSGI plugins)
org.killbill.billing.osgi.dao.url=jdbc:mysql://127.0.0.1:3306/killbill org.killbill.billing.osgi.dao.url=jdbc:mysql://127.0.0.1:3306/killbill_0_17_x
org.killbill.billing.osgi.dao.user=root org.killbill.billing.osgi.dao.user=root
org.killbill.billing.osgi.dao.password=root org.killbill.billing.osgi.dao.password=root


Expand Down
57 changes: 31 additions & 26 deletions profiles/killbill/src/test/java/org/killbill/billing/jaxrs/TestCatalog.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -27,16 +27,19 @@
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.killbill.billing.catalog.api.BillingPeriod; import org.killbill.billing.catalog.api.BillingPeriod;
import org.killbill.billing.catalog.api.Currency; import org.killbill.billing.catalog.api.Currency;
import org.killbill.billing.catalog.api.ProductCategory;
import org.killbill.billing.catalog.api.TimeUnit; import org.killbill.billing.catalog.api.TimeUnit;
import org.killbill.billing.client.KillBillClientException; import org.killbill.billing.client.KillBillClientException;
import org.killbill.billing.client.model.Catalog; import org.killbill.billing.client.model.Catalog;
import org.killbill.billing.client.model.Catalogs;
import org.killbill.billing.client.model.Plan; import org.killbill.billing.client.model.Plan;
import org.killbill.billing.client.model.PlanDetail; import org.killbill.billing.client.model.PlanDetail;
import org.killbill.billing.client.model.Product; import org.killbill.billing.client.model.Product;
import org.killbill.billing.client.model.SimplePlan; import org.killbill.billing.client.model.SimplePlan;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.Test; import org.testng.annotations.Test;


import com.google.common.collect.ImmutableList;
import com.google.common.io.Resources; import com.google.common.io.Resources;


public class TestCatalog extends TestJaxrsBase { public class TestCatalog extends TestJaxrsBase {
Expand All @@ -54,15 +57,15 @@ public void testMultiTenantCatalog() throws Exception {
public void testCatalog() throws Exception { public void testCatalog() throws Exception {
final Set<String> allBasePlans = new HashSet<String>(); final Set<String> allBasePlans = new HashSet<String>();


final Catalog catalogJson = killBillClient.getJSONCatalog(); final List<Catalog> catalogsJson = killBillClient.getJSONCatalog();


Assert.assertEquals(catalogJson.getName(), "Firearms"); Assert.assertEquals(catalogsJson.get(0).getName(), "Firearms");
Assert.assertEquals(catalogJson.getEffectiveDate(), Date.valueOf("2011-01-01")); Assert.assertEquals(catalogsJson.get(0).getEffectiveDate(), Date.valueOf("2011-01-01"));
Assert.assertEquals(catalogJson.getCurrencies().size(), 3); Assert.assertEquals(catalogsJson.get(0).getCurrencies().size(), 3);
Assert.assertEquals(catalogJson.getProducts().size(), 11); Assert.assertEquals(catalogsJson.get(0).getProducts().size(), 11);
Assert.assertEquals(catalogJson.getPriceLists().size(), 4); Assert.assertEquals(catalogsJson.get(0).getPriceLists().size(), 4);


for (final Product productJson : catalogJson.getProducts()) { for (final Product productJson : catalogsJson.get(0).getProducts()) {
if (!"BASE".equals(productJson.getType())) { if (!"BASE".equals(productJson.getType())) {
Assert.assertEquals(productJson.getIncluded().size(), 0); Assert.assertEquals(productJson.getIncluded().size(), 0);
Assert.assertEquals(productJson.getAvailable().size(), 0); Assert.assertEquals(productJson.getAvailable().size(), 0);
Expand Down Expand Up @@ -96,31 +99,33 @@ public void testCatalog() throws Exception {
expectedExceptions = KillBillClientException.class, expectedExceptions = KillBillClientException.class,
expectedExceptionsMessageRegExp = "There is no catalog version that applies for the given date.*") expectedExceptionsMessageRegExp = "There is no catalog version that applies for the given date.*")
public void testCatalogInvalidDate() throws Exception { public void testCatalogInvalidDate() throws Exception {
final Catalog catalogJson = killBillClient.getJSONCatalog(DateTime.parse("2008-01-01")); final List<Catalog> catalogsJson = killBillClient.getJSONCatalog(DateTime.parse("2008-01-01"));
Assert.fail(); Assert.fail();
} }


@Test(groups = "slow", description = "Can create a simple Plan into a per-tenant catalog") @Test(groups = "slow", description = "Can create a simple Plan into a per-tenant catalog")
public void testAddSimplePlan() throws Exception { public void testAddSimplePlan() throws Exception {


killBillClient.addSimplePan(new SimplePlan("foo-monthly", "Foo", Currency.USD, BigDecimal.TEN, BillingPeriod.MONTHLY, 0, TimeUnit.UNLIMITED), requestOptions); killBillClient.addSimplePan(new SimplePlan("foo-monthly", "Foo", ProductCategory.BASE, Currency.USD, BigDecimal.TEN, BillingPeriod.MONTHLY, 0, TimeUnit.UNLIMITED, ImmutableList.<String>of()), requestOptions);
Catalog catalog = killBillClient.getJSONCatalog(requestOptions); List<Catalog> catalogsJson = killBillClient.getJSONCatalog(requestOptions);
Assert.assertEquals(catalog.getProducts().size(),1); Assert.assertEquals(catalogsJson.size(),1);
Assert.assertEquals(catalog.getProducts().get(0).getName(),"Foo"); Assert.assertEquals(catalogsJson.get(0).getProducts().size(),1);
Assert.assertEquals(catalog.getPriceLists().size(),1); Assert.assertEquals(catalogsJson.get(0).getProducts().get(0).getName(),"Foo");
Assert.assertEquals(catalog.getPriceLists().get(0).getName(), "DEFAULT"); Assert.assertEquals(catalogsJson.get(0).getPriceLists().size(),1);
Assert.assertEquals(catalog.getPriceLists().get(0).getPlans().size(), 1); Assert.assertEquals(catalogsJson.get(0).getPriceLists().get(0).getName(), "DEFAULT");
Assert.assertEquals(catalog.getPriceLists().get(0).getPlans().get(0), "foo-monthly"); Assert.assertEquals(catalogsJson.get(0).getPriceLists().get(0).getPlans().size(), 1);

Assert.assertEquals(catalogsJson.get(0).getPriceLists().get(0).getPlans().get(0), "foo-monthly");


killBillClient.addSimplePan(new SimplePlan("foo-annual", "Foo", Currency.USD, new BigDecimal("100.00"), BillingPeriod.ANNUAL, 0, TimeUnit.UNLIMITED), requestOptions);

killBillClient.addSimplePan(new SimplePlan("foo-annual", "Foo", ProductCategory.BASE, Currency.USD, new BigDecimal("100.00"), BillingPeriod.ANNUAL, 0, TimeUnit.UNLIMITED, ImmutableList.<String>of()), requestOptions);
catalog = killBillClient.getJSONCatalog(requestOptions);
Assert.assertEquals(catalog.getProducts().size(),1); catalogsJson = killBillClient.getJSONCatalog(requestOptions);
Assert.assertEquals(catalog.getProducts().get(0).getName(),"Foo"); Assert.assertEquals(catalogsJson.size(),1);
Assert.assertEquals(catalog.getPriceLists().size(),1); Assert.assertEquals(catalogsJson.get(0).getProducts().size(),1);
Assert.assertEquals(catalog.getPriceLists().get(0).getName(), "DEFAULT"); Assert.assertEquals(catalogsJson.get(0).getProducts().get(0).getName(),"Foo");
Assert.assertEquals(catalog.getPriceLists().get(0).getPlans().size(), 2); Assert.assertEquals(catalogsJson.get(0).getPriceLists().size(),1);
Assert.assertEquals(catalogsJson.get(0).getPriceLists().get(0).getName(), "DEFAULT");
Assert.assertEquals(catalogsJson.get(0).getPriceLists().get(0).getPlans().size(), 2);


} }
} }

0 comments on commit a5912cf

Please sign in to comment.