killbill-aplcache

Merge branch 'integration' into server

5/2/2012 1:59:08 PM

stephane brossier

Commit: 7420197

Tree: 3533863

Parents: 2d02dd2
6f50c2a

Changes

analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java 2(+2 -0)

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 2(+2 -0)

Details

analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java 2(+2 -0)

diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
index 06f26ef..3591582 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/TestAnalyticsService.java
@@ -206,6 +206,7 @@ public class TestAnalyticsService {
         final String invoiceDdl = IOUtils.toString(BusinessSubscriptionTransitionDao.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
         final String paymentDdl = IOUtils.toString(BusinessSubscriptionTransitionDao.class.getResourceAsStream("/com/ning/billing/payment/ddl.sql"));
         final String utilDdl = IOUtils.toString(BusinessSubscriptionTransitionDao.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+        final String junctionDdl = IOUtils.toString(BusinessSubscriptionTransitionDao.class.getResourceAsStream("/com/ning/billing/junction/ddl.sql"));
 
         helper.startMysql();
         helper.initDb(analyticsDdl);
@@ -214,6 +215,7 @@ public class TestAnalyticsService {
         helper.initDb(invoiceDdl);
         helper.initDb(paymentDdl);
         helper.initDb(utilDdl);
+        helper.initDb(junctionDdl);
 
     	helper.cleanupAllTables();
     }

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java 2(+2 -0)

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
index 3955cac..941df3c 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegrationBase.java
@@ -151,6 +151,7 @@ public class TestIntegrationBase implements TestFailure {
         final String invoiceDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
         final String paymentDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/payment/ddl.sql"));
         final String utilDdl = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+        final String junctionDb = IOUtils.toString(TestIntegration.class.getResourceAsStream("/com/ning/billing/junction/ddl.sql"));
 
         helper.startMysql();
 
@@ -159,6 +160,7 @@ public class TestIntegrationBase implements TestFailure {
         helper.initDb(invoiceDdl);
         helper.initDb(paymentDdl);
         helper.initDb(utilDdl);
+        helper.initDb(junctionDb);
     }
 
     @BeforeClass(groups = "slow")